-dcpomatic (1.71.0-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
- -- Carl Hetherington <carl@d1stkfactory> Thu, 26 Jun 2014 19:30:39 +0100
-=======
- -- Carl Hetherington <carl@d1stkfactory> Fri, 27 Jun 2014 13:25:44 +0100
->>>>>>> 1.70.0-hotfix
+ -- Carl Hetherington <carl@d1stkfactory> Fri, 29 Aug 2014 19:04:40 +0100
dcpomatic (0.87-1) UNRELEASED; urgency=low