Merge branch 'buxy'

* buxy:
  Add meta-package for tracker.debian.org

Conflicts:
	debian/changelog

diff --cc debian/changelog
index de32e7b6752ad5e48d3063ab54a5e9ef8afcb44f,98ebca929852163f7cbc3d190d843af13cd5e449..2fb83f50aacf8dd3582f2687a060d0d499b432f5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -12,14 -12,9 +12,17 @@@ debian.org (53) UNRELEASED; urgency=lo
    * manpages:
      + replace gs-common with ghostscript
  
 +  [ Hector Oron ]
 +  * d/control: add postgresql-client to qa.debian.org
 +    - Apply patch from Bart Martens
 +
 +  [ Enrico Zini ]
 +  * nm.d.o update:
 +    + python-lzma
 +
+   [ Raphaël Hertzog ]
+   * Add initial meta-package for tracker.debian.org.
+ 
   -- Bernhard R. Link <brlink@debian.org>  Sun, 13 Oct 2013 11:55:19 +0200
  
  debian.org (52) unstable; urgency=low

diff --cc debian/control
Simple merge