]> 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, 22 Jan 2011 14:23:29 +0000 (10:23 -0400)
committerJoey Hess <joey@kitenet.net>
Sat, 22 Jan 2011 14:23:29 +0000 (10:23 -0400)
commit872dc3de27e86ee2491c48a9156983a58e598f63
tree4debaee23df84ea37188a22e862d92d1704985ce
parentafeb8db569b7e9bf52d418417e7af4153c10cb9a
parent4e6426236bc32f5571265febcc860fb31fa10481
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info