~jonas-drange/ubuntu-system-settings/rtm-1388044

Viewing all changes in revision 949.

  • Committer: jonas-drange
  • Date: 2014-12-11 16:54:03 UTC
  • Revision ID: jonas.drange@canonical.com-20141211165403-grwkchs4d2grr7yz
merge manually, since this just didn't merge at all

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: