]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'origin/master'
authorintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 20:51:23 +0000 (21:51 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 20:51:23 +0000 (21:51 +0100)
commit0f75ca66a743fcf69a83b3218da099ea0042493f
tree875b1613b2843fceacba9d64e79525e2d37e14bc
parenta9e45d868b721de2edba958a41fafa05c548359c
parent2863b45b5f93de8708ea20cf3db15ca610a467d7
Merge commit 'origin/master'

Conflicts:

debian/control
debian/control