[SCM] bdsup2sub++/master: merge changelog entries

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 83100494317a0fd1a43698a6eead6bcfd5376f03
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu May 9 21:30:42 2013 +0200

    merge changelog entries

diff --git a/debian/changelog b/debian/changelog
index 55ba794..e0064b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-bdsup2sub++ (1.0.0-2) unstable; urgency=low
+bdsup2sub++ (1.0.0-1) unstable; urgency=low
 
   * New upstream version
   * Fix bug in writing out INI settings
@@ -7,9 +7,3 @@ bdsup2sub++ (1.0.0-2) unstable; urgency=low
   * Add error handling to CLI for detecting whether SUP file is from DVD or HD DVD.
 
  -- Adam Thomas-Murphy <amichaeltm at gmail.com>  Wed, 18 Jul 2012 18:24:47 -0600
-
-bdsup2sub++ (1.0.0-1) unstable; urgency=low
-
-  * Initial release
-
- -- Adam Thomas-Murphy <amichaeltm at gmail.com>  Sat, 14 Jul 2012 11:18:47 -0600

-- 
bdsup2sub++ packaging