-dcpomatic (1.71.0-1) UNRELEASED; urgency=low
+dcpomatic (2.0.1-1) UNRELEASED; urgency=low
* 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@dalglish> Wed, 06 Aug 2014 18:59:35 +0100
=======
- -- Carl Hetherington <carl@d1stkfactory> Fri, 27 Jun 2014 13:25:44 +0100
->>>>>>> 1.70.0-hotfix
+ * New upstream release.
+ * New upstream release.
+
+ -- Carl Hetherington <carl@d1stkfactory> Sat, 09 Aug 2014 12:38:18 +0100
+>>>>>>> origin/master
dcpomatic (0.87-1) UNRELEASED; urgency=low