]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Sat, 24 Jul 2010 21:34:19 +0000 (17:34 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 24 Jul 2010 21:34:19 +0000 (17:34 -0400)
commitcba6935f55f95b99a177d2cbe9130d6d589e10a8
tree814f24769992717ab407799453c6057a1cdee469
parent0aa621a833930795fd10c5a701b33b6a1705d03f
parent84677e01f2fa6baee83a780d6dbc8686b88ac739
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info