Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Tue, 25 Feb 2014 04:14:50 +0000 (00:14 -0400)
committerJoey Hess <joey@kitenet.net>
Tue, 25 Feb 2014 04:14:50 +0000 (00:14 -0400)
commitbc94b6a76ebd07d64bac78776b7d10d6e1265a28
treec4f494ca08fbb206f01b4cd324d84f4b6659db2b
parente5fd29803493b875015fe6366cc430f171ddc898
parentd28d4447de8da999e208afedb6a4feb019644973
Merge branch 'master' of ssh://git.ikiwiki.info