Merge branch 'dev-df3120-michel-staging' into dev-df3210-staging
commita364b25932732b55e1f1c2d05a0cf07ceb0da804
authorMichel Pollet <buserror@gmail.com>
Sat, 27 Nov 2010 17:10:45 +0000 (27 17:10 +0000)
committerMichel Pollet <buserror@gmail.com>
Sat, 27 Nov 2010 17:10:45 +0000 (27 17:10 +0000)
treebd8caf19c6c0e171337a713fd46bdc793355c43d
parenta7ae058a8c2a569e8ded2e8230bfb0f4a76447a0
parentdf93a795a8d4e90bcfeab8bd0ebe0527fd9fd17d
Merge branch 'dev-df3120-michel-staging' into dev-df3210-staging