Merge branch 'master' into templatemove
authorJoey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 20:43:44 +0000 (16:43 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 23 Apr 2010 20:43:44 +0000 (16:43 -0400)
commit7bba52254569047ef1d9f5752096f155b0a2be77
tree0c79effe8cbf7847e36557e4ed9fe10d08728a33
parent6486452e4c94f5699d98d13e25a361435ed3ddeb
parentd822e37d0efc34f2267f275030de11cd3c7ff7bb
Merge branch 'master' into templatemove

Conflicts:
doc/templates.mdwn
Makefile.PL
doc/todo/auto_rebuild_on_template_change.mdwn