Viewing all changes in revision 28.

Committer: Whit Morriss
Date: 2014-10-28 14:37:41 UTC
mfrom: <a title="Merged From 26.1.2" href="/~cf-charmers/charms/trusty/cf-webadmin/trunk/revision/26.1.2">(26.1.2 trunk)
Revision ID: whit.morriss@canonical.com-20141028143741-211suz8eqnycy3tr

Merge branch 'master' of github.com:whitmo/cf-admin-ui

Conflicts:
hooks/actions.py

added added

removed removed