Merge branch 'master' into templatemove
authorJoey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 20:48:53 +0000 (16:48 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 20:48:53 +0000 (16:48 -0400)
commite8a23c299e0ec548110283516b8413cdaff8737e
tree2904172a24d1d75cd928aa9565f2b32933d23300
parent7bba52254569047ef1d9f5752096f155b0a2be77
parentd5c5fef363564261ccba236f1d64eaa60567d514
Merge branch 'master' into templatemove
doc/todo/auto_rebuild_on_template_change.mdwn