easydigitaldownloads/Easy-Digital-Downloads — pull request #2513 by ghost1227 (2014-08-12 16:01:57+00:00)
Title: Fix merge conflicts with release/2.1

Issue #2256