cirosantilli/testme — pull request #2 by cirosantilli (2014-07-07 19:00:02+00:00)
Title: Merge request conflict.

Commit to test merge requests.

DO NOT MERGE THIS DIRECTLY. Create it on branch ` merge-request1` and delete this PR then.