~alan-griffiths/mir/revert-c2238

Viewing all changes in revision 2207.4.5.

  • Committer: Daniel van Vugt
  • Date: 2015-01-14 06:39:13 UTC
  • mfrom: (2219 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2232.
  • Revision ID: daniel.van.vugt@canonical.com-20150114063913-hp880xul6y5grfyr
Merge latest trunk and fix conflicts.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: