Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Mon, 17 Nov 2014 14:49:02 +0000 (10:49 -0400)
committerJoey Hess <joey@kitenet.net>
Mon, 17 Nov 2014 14:49:02 +0000 (10:49 -0400)
commit3949e54c1a96aa33db44b9511f17ed4735d54ec7
treebeec5bea4aa369bdd2992d336e8ffa3c33f28a03
parentfae3a49cfe37c3661507ed05588a9b37ce27a1d4
parent93a5f4688c6f381bad02ba92481fb54bcd555ce9
Merge branch 'master' of ssh://git.ikiwiki.info