Merge branch 'master' into m1
Merge branch 'master' into m1
Moved crm-contact-lite to the top to align with gr8conf talk
Moved crm-contact-lite to the top to align with gr8conf talk
Added description of branches m3 and m4
Merge branch 'master' into m1
Merge remote-tracking branch 'origin/m1' into m2