luacm/git-intro — pull request #5 by miketoth (2013-08-13 05:32:42+00:00)
Title: Fixed merge conflicts 

All changes are now in one branch but there are no conflicts :)