Merge branch 'origin-hotfix-7.8.06'
commitc077d5714c7a4658647be6090e755733ffe7095f
authorEric Schulte <eric.schulte@gmx.com>
Mon, 26 Mar 2012 11:39:29 +0000 (26 07:39 -0400)
committerEric Schulte <eric.schulte@gmx.com>
Mon, 26 Mar 2012 11:39:29 +0000 (26 07:39 -0400)
tree5ed7d0a1814cb8d9f88803bd335f3c8bb7ed2248
parent7b172ade00946c04d365abfd9047ee699d3cda5e
parent4202665f5b93feb2af87c50a260d5cfc1455ca73
Merge branch 'origin-hotfix-7.8.06'