easydigitaldownloads/Easy-Digital-Downloads — pull request #1168 by chriscct7 (2013-05-11 16:13:17+00:00)
Title: Hotfix/1100

Fixes #1100
Updated pull to remove merge conflicts of #1125
Added Sunny's changes