]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Wed, 23 Jun 2010 17:05:02 +0000 (13:05 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 23 Jun 2010 17:05:02 +0000 (13:05 -0400)
commit0d1f736c659fcabb484abe77c714c4bf04b34a4f
tree5fdd0c8b47d83c6399cc4e5170c9ae5f0c4b2881
parent4048988576c4ad23293379751b438af0bdb4b310
parent7d55ee1961d52cc79ab533e0cde7f53af21a075d
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info