oscmejia/gitlab-vov — pull request #2 by oscmejia (2014-07-17 02:16:59+00:00)
Title: Merge pull request #1 from oscmejia/new/merge-conflict-solved

conflict-solved