merge trunk to branch
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 26 Jun 2012 20:12:51 +0000 (20:12 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Tue, 26 Jun 2012 20:12:51 +0000 (20:12 +0000)
commitf67430cd1c0c25f61e0a5d306d0dad297bfda01b
tree230a246206ecab01758bbd1cd0d448572adca43e
parentf233446ed2e044c107d674051957237afeb35d56
parentc3d0aff1a5bb7506a08cc284ffbdee6e00e6201a
merge trunk to branch