]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 16 Aug 2012 00:27:27 +0000 (17:27 -0700)
committerJoey Hess <joey@kitenet.net>
Thu, 16 Aug 2012 00:27:27 +0000 (17:27 -0700)
commit16a8a0e1e29e2ab197012972230760d0e71412fb
tree98a92c15d9f9963378a7c7ae634a67e63ba50e22
parent44378db5a8593bbabe1974b4d37ab20c618135e7
parent2ced2b87d8deac093208fa250a04070df83236a5
Merge branch 'master' of ssh://git.ikiwiki.info