]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commit
Merge commit 'upstream/master'
authorintrigeri <intrigeri@boum.org>
Tue, 18 Nov 2008 23:05:13 +0000 (00:05 +0100)
committerintrigeri <intrigeri@boum.org>
Tue, 18 Nov 2008 23:05:13 +0000 (00:05 +0100)
commita9e45d868b721de2edba958a41fafa05c548359c
treee4d37dcc76d1d93f697e887230dd659a08387daa
parent7f744c0444f64087e1c598007730599b01642954
parent23f5874a56f66c0bb5d5921d21418c7363786b1b
Merge commit 'upstream/master'

Conflicts:

debian/control