]> sipb.mit.edu Git - ikiwiki.git/commit
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 14 Mar 2010 17:16:12 +0000 (13:16 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 14 Mar 2010 17:16:12 +0000 (13:16 -0400)
commitc944bffe3dbad0746880a0cd573808f04505ebdd
tree4458b5f74a6bcd722ee64d41ab29387e09bac682
parent30c30a0cdde44491370a1e5a0ef371a4f92c4965
parent7c5bfbe2b614b1cadc13fcab2a427abc711579b0
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info