Merge branch 'dev-df3120-michel-staging' into dev-df3210-staging
commit311155b4f3408e77e15fd1df0aa2f53139a8faeb
authorMichel Pollet <buserror@gmail.com>
Sat, 27 Nov 2010 17:32:15 +0000 (27 17:32 +0000)
committerMichel Pollet <buserror@gmail.com>
Sat, 27 Nov 2010 17:32:15 +0000 (27 17:32 +0000)
tree027f436a8a58e6808908cf60196be1b633dad213
parenta364b25932732b55e1f1c2d05a0cf07ceb0da804
parent8fe2b19364add6968b5de64f26daca1e953cd11b
Merge branch 'dev-df3120-michel-staging' into dev-df3210-staging