merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Fri, 19 Jul 2013 08:28:13 +0000 (08:28 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Fri, 19 Jul 2013 08:28:13 +0000 (08:28 +0000)
commit3e438be99b5400c7ae1e451840512579bade3ac1
tree5670ebc19c904271a4e726273f1410ee470f1771
parentacb8bc98cf8e65cc2a07343186aabeece409d2f8
merge-update from trunk