Viewing all changes in revision 2267.
- Committer: Gavin Panella
- Date: 2014-07-15 16:48:47 UTC
- mfrom: (1745.2.493 maas)
- Revision ID: gavin.panella@canonical.com-20140715164847-zhtbjs009jclcppy
Merge trunk r2238, resolving 1 minor conflict.
- files added:
- docs/_static/versions.js
- files modified:
- Makefile
expand all
collapse all
added
removed
