gittraining-foo/git-foo-bar — pull request #3 by CMPITG (2012-07-06 03:28:28+00:00)
Title: Fixed conflicts

Please merge!