]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@kitenet.net>
Thu, 24 Mar 2011 17:37:40 +0000 (13:37 -0400)
committerJoey Hess <joey@kitenet.net>
Thu, 24 Mar 2011 17:37:40 +0000 (13:37 -0400)
commit9f7f12809041ab70fdde1f9695d450c64b1ca675
tree4214fc79f9f4dfb9dfac31d10f5efdf9f562b81a
parent78c750f2d28f23e7cfc56890999bcd313cf711c7
parent8a8277faf8a084694745cfd20906733df46b4ff9
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info