tree 1e94701213f73625ad762d2b96f0b54c61892b2b
parent 387ea6e3bb70b233c397ab13fb20a307ab512e56
parent 31bf16659f886c8abf277824bebbec1e84998a29
author Andrew Phillips <demobox1@yahoo.co.uk> 1286359253 +0200
committer Andrew Phillips <demobox1@yahoo.co.uk> 1286359253 +0200

Merge remote branch 'origin/1.0-beta-7' into 1.0-beta-7