Merge branch 'master' into account
authorVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 13 Nov 2009 23:21:02 +0000 (00:21 +0100)
committerVincent Zanotti <vincent.zanotti@m4x.org>
Fri, 13 Nov 2009 23:21:02 +0000 (00:21 +0100)
commit353f2d2b11c4e3c6c0bc3553813368b6f42fa9c6
treea9950684ba4857743cc49189266f61953ec4a0d7
parent5660032ac785d410f90e3f5b0d6948dc90b0cfea
parent1d2a93823871cbd35b2457fa531a6a562e49da06
Merge branch 'master' into account