-dcpomatic (1.71.1-1) UNRELEASED; urgency=low
+<<<<<<< HEAD
+dcpomatic (2.0.4-1) UNRELEASED; urgency=low
+=======
+dcpomatic (1.73.0-1) UNRELEASED; urgency=low
+>>>>>>> origin/master
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
* New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
+ * New upstream release.
-<<<<<<< HEAD * New upstream release.
-
- -- Carl Hetherington <carl@d1stkfactory> Sat, 28 Jun 2014 00:53:18 +0100
+ -- Carl Hetherington <carl@d1stkfactory> Fri, 29 Aug 2014 19:04:40 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low