tree aba9dc9e46644af6894eddb2148c836bdaa9c229
parent eefd280c98fb1e185ea5043323d7f8718a01354d
parent bf96750ba9461788852b23ada23a3a28bbf6477d
author Flemmard <flemmard@gmail.com> 1394477619 +0100
committer Flemmard <flemmard@gmail.com> 1394477619 +0100

Merge branch 'cm-11.0' into 8660-tp-merge