]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'origin/master' into pub/master
authorintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 00:54:13 +0000 (01:54 +0100)
committerintrigeri <intrigeri@boum.org>
Mon, 24 Nov 2008 00:54:13 +0000 (01:54 +0100)
commit2863b45b5f93de8708ea20cf3db15ca610a467d7
treef0fbafb92045fd1be1c812fde5138ccb2af2d76b
parentfe04efa1b8fce2524faa96378a049e9e7118f481
parent2121cac131765e0d7524e27e821b0bc4ceb36d40
Merge commit 'origin/master' into pub/master

Conflicts:

debian/control
debian/control