]> 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, 18 Feb 2011 03:50:15 +0000 (23:50 -0400)
committerJoey Hess <joey@kitenet.net>
Fri, 18 Feb 2011 03:50:15 +0000 (23:50 -0400)
commit4524853fa741b0c164211a38d95c549062b3c3f1
treed666239c39bbdac01feba45bcbc7bc0f70231d7e
parent8a1fcd5a5ab43d91e14c521dce1dcd8ae59a4946
parentf1d0673e08d7b0a557bb28ed5f424a2173620a03
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info