marxama/git-test — pull request #2 by marxama (2012-09-29 14:12:22+00:00)
Title: Merge from branch

Conflicting changes!