merge branch master

This commit is contained in:
Helmut Merz 2012-06-05 10:54:52 +02:00
commit df1e93d536