Merge branch 'origin-hotfix-7.8.06'
commitc8294348efcd4e2d2163ec8d66969b3b1d52e8f4
authorEric Schulte <eric.schulte@gmx.com>
Tue, 10 Apr 2012 20:02:16 +0000 (10 16:02 -0400)
committerEric Schulte <eric.schulte@gmx.com>
Tue, 10 Apr 2012 20:02:16 +0000 (10 16:02 -0400)
tree372d11e11e320da23bbec6abaa0c965b5990ed25
parent97d2db486737d7c539018f2d60c5e5e551d4b7b7
parent6c1b38182b377c397c50f11bc86eca145d9cc5c2
Merge branch 'origin-hotfix-7.8.06'