Viewing all changes in revision 7.

Committer: Cody Garver
Date: 2014-02-21 20:46:06 UTC
mfrom: <a title="Merged From 4.1.1" href="/~elementary-os/elementaryos/os-patch-base-files-precise/revision/4.1.1">(4.1.1 base-files-precise)
Revision ID: cody@elementaryos.org-20140221204606-ql39jbk3o2t6a0m7

Merge in and resolve conflicts from lp:~elementary-os/ubuntu-package-imports/base-files-precise

added added

removed removed