Viewing all changes in revision 13.

Committer: Charles Butler
Date: 2015-09-28 15:02:11 UTC
mfrom: <a title="Merged From 4.1.7" href="/~charmers/charms/trusty/flannel-docker/trunk/revision/4.1.7">(4.1.7 flannel-docker)
Revision ID: chuck@dasroot.net-20150928150211-v3b04174zdtml0av

[r=tvansteenburgh] Charles Butler 2015-09-28 Adds simplejson to tox dependency list

added added

removed removed