Viewing all changes in revision 141.
- Committer: Corey Goldberg
- Date: 2014-09-18 14:48:33 UTC
- mfrom: (136.1.3 trunk)
- Revision ID: corey.goldberg@canonical.com-20140918144833-i4i08h9qnhzhxc7c
merged trunk and fixed conflicts
- files modified:
- NEWS.rst
expand all
collapse all
added
removed
