Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 30 Dec 2013 17:47:44 +0000 (13:47 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 30 Dec 2013 17:47:44 +0000 (13:47 -0400)
commit7159e7ea9039d2e3227c5e0f8d22e89df672b5e3
tree9ecd66e85dcbeedf250138aeb3bde5d2c9af140a
parenta2fb23286fee47875f8d7d261b4c9b6a5fb3606a
parent85e97bd9753676f261449a1dbbaeb0dc038bb91e
Merge branch 'master' of ssh://git.ikiwiki.info