netpro2k/pullRequestTest — pull request #1 by netpro2k (2012-03-02 20:59:15+00:00)
Title: Testing pull request for non ff merge

This branch has 2 commits branching off first commit on master. Master has 1 diverged but non-conflicting change. Lets see what happens.