The following commit has been merged in the master branch: commit 552b6ea88b0dacefd2bdad2ce67a1ed86bb5f754 Merge: b545e721cd8b1f09e8cb979eda4b06724f9707a2 a27102b264714dcec2651ba7a2888654daa3f2e1 Author: Rene Engelhard <rene@debian.org> Date: Thu Jul 25 18:10:20 2013 +0200 Merge remote-tracking branch 'origin/debian-experimental-4.1' Conflicts: changelog -- LibreOffice packaging repository