[Commotion-admin] [commotion-docs] Update Master from Staging - rolling (#341)

[critzo]

Merged #341.

---
Reply to this email directly or view it on GitHub:
https://github.com/opentechinstitute/commotion-docs/pull/341#event-379591823
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20150811/59d84ba7/attachment.html>