patrickhuber/Contineo — pull request #2 by patrickhuber (2014-11-15 05:04:13+00:00)
Title: Merge pull request #1 from patrickhuber/master

merge dev to master