Merge commit 'origin/platal-0.10.2'
authorVincent Zanotti <vincent.zanotti@m4x.org>
Sun, 15 Nov 2009 23:06:09 +0000 (00:06 +0100)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Sun, 15 Nov 2009 23:06:09 +0000 (00:06 +0100)
commite7802541a0721f5973a4bcb5a05f5e5cfd691056
tree456aef3a2962a94b7e014ce99db931803ffe4bd6
parent1d2a93823871cbd35b2457fa531a6a562e49da06
parent88b505b024fef07ba119ad172e28601bd5725237
Merge commit 'origin/platal-0.10.2'

Conflicts:
core

Signed-off-by: Vincent Zanotti <vincent.zanotti@m4x.org>
core