mixing it right
Merge branch 'lms' of https://github.com/manojo/lamp-dp-mt into lms