Merge branch 'master' into experimental
authorJulien Valroff <julien@kirya.net>
Mon, 28 Feb 2011 20:46:11 +0000 (21:46 +0100)
committerJulien Valroff <julien@kirya.net>
Mon, 28 Feb 2011 20:46:11 +0000 (21:46 +0100)
Conflicts:
debian/changelog
debian/copyright
debian/patches/series

1  2 
debian/changelog
debian/copyright

@@@ -1,9 -1,10 +1,16 @@@
 +pino (0.2.85-1) experimental; urgency=low
 +
 +  * First alpha version of the 0.3 branch
 +
 + -- Julien Valroff <julien@debian.org>  Sun, 02 Jan 2011 13:50:06 +0100
 +
+ pino (0.2.11-4) unstable; urgency=low
+   * Apply patches from upstream bug tracker to allow build with recent
+     vala versions (Closes: #614431)
+  -- Julien Valroff <julien@debian.org>  Sun, 27 Feb 2011 14:21:52 +0100
  pino (0.2.11-3) unstable; urgency=low
  
    * Bump debhelper compat to 8
Simple merge