test-github-ci/bad-merge — pull request #2 by ruslo (2013-10-24 22:17:33+00:00)
Title: Update test.cpp

branch good 2