jhodapp/gstreamer — pull request #1 by iainlane (2013-08-01 10:32:34+00:00)
Title: Conflicts

Fix conflict markers. I also sorted the lists.