juju/charm — pull request #23 by frankban (2014-07-23 09:11:11+00:00)
Title: Merge master

Merge changes in the master branch and resolve conflicts.