modxcms/revolution — pull request #12056 by rtripault (2014-10-13 20:47:44+00:00)
Title: Fix a badly merged conflict

Closes #12055

(sorry!)