Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 30 Mar 2013 17:44:56 +0000 (13:44 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 30 Mar 2013 17:44:56 +0000 (13:44 -0400)
commitfa5a8aae76c705913467d2e41f50692a9ac1fc26
treebfeb8741dd30ab66d13393b8d6b483d5e4a53acb
parent29e10f0f8f826b8a94e4b983067cb7a406d33189
parent28642f47f7814bac757f700af0e28c88cad7e67a
Merge branch 'master' of ssh://git.ikiwiki.info