Merge branch 'merge-florian' into gitorious
authorOlivier Berger <olivier.berger@it-sudparis.eu>
Mon, 14 Feb 2011 08:59:48 +0000 (09:59 +0100)
committerOlivier Berger <olivier.berger@it-sudparis.eu>
Mon, 14 Feb 2011 08:59:48 +0000 (09:59 +0100)
commit4372384d9a2a282621ece605c6f85fcaf1b4b9d5
tree6100ddfb535a79883a314b41a102bccb39137472
parent79edd701ed8e91f9530364398b7eb2e55aba726c
parent858018007a15c575bbb11926835c8d37422b203a
Merge branch 'merge-florian' into gitorious

Conflicts:
trunk/bugplucker.py
trunk/bugplucker.py