commit 62d46cd17f6f98fa1e5322aed1027390ed070810 Merge: 69f78cf 8e5a705 Author: René Nussbaumer <[email protected]> Date: Fri Oct 21 14:49:08 2011 +0200
Merge branch 'devel-2.4' into stable-2.5
commit 62d46cd17f6f98fa1e5322aed1027390ed070810 Merge: 69f78cf 8e5a705 Author: René Nussbaumer <[email protected]> Date: Fri Oct 21 14:49:08 2011 +0200
Merge branch 'devel-2.4' into stable-2.5