ASirik/githowto — pull request #1 by zheyakush (2013-12-06 14:43:28+00:00)
Title: Revert "Revert "Merge conflict""

This reverts commit 076df3d4d059a8dc77705c60dd927183dcbd27bc.