Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 18 Apr 2014 15:40:19 +0000 (11:40 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 18 Apr 2014 15:40:19 +0000 (11:40 -0400)
commit5df475c81398b42fa0fa3f710d7268d15ae920ae
tree072f82cb29eaa3442e632544073affff2d7812e4
parenta9eb75d1207f7cd5ada02c530cd576c03e48410e
parent1c5d01e7e600646678c32d192ca19b21493410c9
Merge branch 'master' of ssh://git.ikiwiki.info