rmerizalde/opencommercesearch — pull request #113 by lujameva (2014-03-12 21:25:19+00:00)
Title: Solving merge conflicts

After a commit squash there were unsolved conflicts and didn't notice before.