Merge branch 'master' into templatemove
authorJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 04:46:17 +0000 (00:46 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 24 Apr 2010 04:46:17 +0000 (00:46 -0400)
commit8a56df576a9d7d184a5233bcde8ea07eee86dd60
treec8b9b62e64e663650b847e9a6a1bf81c356bc975
parenta46e17893204142c4cb3400057e814aa7856d350
parentbe3d754320088ecbb0d60a1675d71078611ef62c
Merge branch 'master' into templatemove