]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 17:28:31 +0000 (13:28 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 7 May 2010 17:28:31 +0000 (13:28 -0400)
commit30ac000b5ac53822e5548e314842f036f96294a9
treebdc18fc1f97004c4cd93693965fc418ba26d26bc
parentb01a2274c3f96541b8b48f9ebb883ee8b7451fa3
parent4549a4aaa81fa9dbed87954def3eec5bca974157
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info