-
Committer:
Package Import Robot
-
Author(s):
Timo Aaltonen
-
Date:
2012-11-27 17:39:22 UTC
-
mfrom:
(2.1.18 sid)
-
mto:
This revision was merged to the branch mainline in
revision
28.
-
Revision ID:
package-import@ubuntu.com-20121127173922-uwrunnfom8vf2g88
* Merge from Debian unstable. Remaining changes:
- rules: Enable Thumb2 build on armel, armhf.
- control: Change Vcs-* to XS-Debian-Vcs-*.
- control: Add conflicts to evolution-documentation-*,
language-support-translation-*.
- control: Add Breaks: evolution-plugins.