Merge branch 'origin-hotfix-7.8.06'
commit2ef04872ed5a52601b35b34dd3c5cf232f37379d
authorEric Schulte <eric.schulte@gmx.com>
Mon, 26 Mar 2012 11:45:54 +0000 (26 07:45 -0400)
committerEric Schulte <eric.schulte@gmx.com>
Mon, 26 Mar 2012 11:45:54 +0000 (26 07:45 -0400)
treeeb75320dcb911f72bbf4bcc68961fc8b06b885d8
parentc077d5714c7a4658647be6090e755733ffe7095f
parentab76b8f29eac87c36ef881f4ecaa78e8a3740f16
Merge branch 'origin-hotfix-7.8.06'