]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge branch 'master' into prefix-directives
authorJosh Triplett <josh@freedesktop.org>
Sun, 10 Feb 2008 07:02:52 +0000 (23:02 -0800)
committerJosh Triplett <josh@freedesktop.org>
Sun, 10 Feb 2008 07:02:52 +0000 (23:02 -0800)
commit122f6df3259e8ca1dd96554d08cebce4b5c55acc
tree2e1d6f54e62936792176caba483af8cc0907c755
parentfb82474be06f1be2c96bdfc231c3768cabe0d4eb
parent8b577726ab3768d50ca7d3fdef240e37fe046fc2
Merge branch 'master' into prefix-directives

Conflicts:

debian/changelog
templates/change.tmpl
debian/changelog
templates/change.tmpl