]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into dependency-types
authorJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Oct 2009 20:54:23 +0000 (16:54 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Sun, 11 Oct 2009 20:54:23 +0000 (16:54 -0400)
commita7cb3090902e23e2b0f2371539ade7ec5a4ba01b
tree1f97182b72da88c2f3d49980101242b8b5d073a2
parent5dba91cdc88c01ac1d314f24b12eb2cda651e206
parent665da89c270f98e93b1eaa89e729f3975973ab8f
Merge branch 'master' into dependency-types

Conflicts:
debian/changelog
doc/plugins/calendar.mdwn
debian/changelog