Merge branch 'overplucker'
authorOlivier Berger <olivier.berger@it-sudparis.eu>
Thu, 7 Jul 2011 08:34:25 +0000 (10:34 +0200)
committerOlivier Berger <olivier.berger@it-sudparis.eu>
Thu, 7 Jul 2011 08:34:25 +0000 (10:34 +0200)
commitc35a02cdcfaad6c12b7e67954a2f8c98703fe948
tree24a0f205c55a48347fa70493394a843ae663306c
parent7bc3650a78bbae80561dad709903260cfc0ff4cd
parent4436b6073042a5324357cd1c9277c5f5a476bc96
Merge branch 'overplucker'

Conflicts:
trunk/bugplucker.py
trunk/forgeplucker/handle_fusionforge.py
trunk/forgeplucker/handle_fusionforge.py