Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sun, 3 Jun 2012 17:17:03 +0000 (13:17 -0400)
committerJoey Hess <joey@kitenet.net>
Sun, 3 Jun 2012 17:17:03 +0000 (13:17 -0400)
commit6622d913dd0ca91f35eae1c9ca1e5b764112514f
treefe5e950def7ea24a3202b19978183365b62c7cad
parent939d8c56754b1a5b5e75d719f6d1d05949f3d164
parent33f84ca3a35ac10e229cdb132f4fed90af41b049
Merge branch 'master' of ssh://git.ikiwiki.info