]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 11 Aug 2012 20:24:11 +0000 (16:24 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 11 Aug 2012 20:24:11 +0000 (16:24 -0400)
commit44378db5a8593bbabe1974b4d37ab20c618135e7
tree990eefd6baa674fd9efaeb3eeec6dbf3842b7f79
parent94f826498cde963ab88748a27818b23453e0b94a
parent44ffdd28462b0084ae81934dd8766340b74b3b53
Merge branch 'master' of ssh://git.ikiwiki.info