Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 18 Nov 2013 15:18:13 +0000 (11:18 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 18 Nov 2013 15:18:13 +0000 (11:18 -0400)
commit6e2d7735c560005a3f9dd3d6b09de88bc38858ae
treec77eb32a9f70d62dd2f7e1b3e99bdf0da81a5c98
parentb48f616b7d94d4dd308008f024a0a349298b0135
parentf5ba29913c331051dfc5e9c1733995b447e8f3a6
Merge branch 'master' of ssh://git.ikiwiki.info