[MERGE] debian: update changelog for v6.0.4
authorXavier ALT <xal@openerp.com>
Tue, 20 Mar 2012 17:30:59 +0000 (18:30 +0100)
committerXavier ALT <xal@openerp.com>
Tue, 20 Mar 2012 17:30:59 +0000 (18:30 +0100)
bzr revid: xal@openerp.com-20120320173059-6ljlls0834xq38rz


Trivial merge