Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joeyh@joeyh.name>
Mon, 29 Dec 2014 19:50:41 +0000 (15:50 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 29 Dec 2014 19:50:41 +0000 (15:50 -0400)
commit8a98440db6454fc8653c264f61502bd0d1d6baf8
treed6272e299158afb28cb64ab4ade342b93752922d
parent1d6dec40ebde1afa81aec05a68dc5649782c4b1f
parent04596b5a37cb486467c5c2fe2d06a822a6fe6a79
Merge branch 'master' of ssh://git.ikiwiki.info