]> 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, 9 Feb 2011 19:56:17 +0000 (15:56 -0400)
committerJoey Hess <joey@kitenet.net>
Wed, 9 Feb 2011 19:56:17 +0000 (15:56 -0400)
commit08ad8d95219fc40bc68725b5a8cc5d6ca358eddf
tree0ff9cf9371a89c2466fe92b9a2a4dc7e9dcf3028
parent02f019de24719f62abd9f8d56cc534dc6e906bd9
parent8f65520ed35875eedc4c455c8e14dc8be9e95608
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info