Merge branch 'external-backup' into develop
authorPascal Mages <pascal.mages@avertas.ch>
Sun, 24 Oct 2010 14:42:39 +0000 (16:42 +0200)
committerPascal Mages <pascal.mages@avertas.ch>
Sun, 24 Oct 2010 14:42:39 +0000 (16:42 +0200)
commitc2a7dbde26d281c2ad5de09cbf41fb8448bfb6bf
tree55df1e8b96aaf5978bb301f6dbfe9becc6fe2c2e
parent35ecc6e5a8c9556190f861fd5a3f4dcc451abc5f
parent7f48c30c1a59b968e7e7fa9538a523ad09d3b10d
Merge branch 'external-backup' into develop