Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 3 Mar 2012 21:34:46 +0000 (17:34 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 3 Mar 2012 21:34:46 +0000 (17:34 -0400)
commit503869ce88eb712d506082b0a80ef447aca0e646
tree752dcc0d760454d9a0d7cb98152b46bad125e875
parent4b3ce9df72f4c2204156d0705937f36b0e08e155
parente74bb57eea8d69b9fc1d878ade695e759fed4fb5
Merge branch 'master' of ssh://git.ikiwiki.info