[SCM] composite/master: Update

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 23ff393a0f2280a20e4d14867f3a36a3375d7b0e
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jul 16 09:25:32 2011 +0200

    Update

diff --git a/debian/changelog b/debian/changelog
index c0a749c..2896b94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 composite (0.006.1-1) unstable; urgency=low
 
+  [ Jaromír Mikeš ]
   * New upstream stable release.  
   * Bump Standards
   * removed patches applied upstream
   * updated copyright file to rev. 174
 
+  [ Alessio Treglia ]
+  * Enable parallel builds.
+
  -- Jaromír Mikeš <mira.mikes at seznam.cz>  Sat, 16 Jul 2011 09:13:41 +0200
 
 composite (0.006-5) unstable; urgency=low

-- 
composite packaging