Merge branch 'refs/heads/2.0'
authorMatthias Schmidt <gravatronics@live.com>
Tue, 1 Jul 2014 19:10:31 +0000 (21:10 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 1 Jul 2014 19:10:31 +0000 (21:10 +0200)
commit0eef0a99686872555a586842ef16a950172b9116
treee01d355b12e2b11bdd98f53a9723312577b0ad99
parent182e2322abb9b7f0c5fb00e772a1ce48e95d180a
parent0e79222a8b545b3f757700432321aab189021fba
Merge branch 'refs/heads/2.0'