merge trunk to hibernate4
authorAndreas Müller <a.mueller@bgbm.org>
Mon, 8 Apr 2013 08:40:18 +0000 (08:40 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Mon, 8 Apr 2013 08:40:18 +0000 (08:40 +0000)

Trivial merge