Merge branch 'master' into api_embellishment
commit6fc4db8834c069e7ec38459b40fcef0d900f239a
authorMikaël Barbero <mikael.barbero@obeo.fr>
Fri, 5 Oct 2012 10:03:00 +0000 (5 12:03 +0200)
committerMikaël Barbero <mikael.barbero@obeo.fr>
Fri, 5 Oct 2012 10:03:00 +0000 (5 12:03 +0200)
tree849e6fded3d12d95b41ba9bc0262b501b14799c5
parent1c2e6e2b38902c1e01c8bf1ffe5c5a9b2aa2172e
parent46abe539f06a0b58fbbb8ceabb55a4371d8cf6e7
Merge branch 'master' into api_embellishment