waysome/waysome — pull request #312 by neithernut (2014-10-27 13:35:28+00:00)
Title: Make the CI perform a merge before building

This (hopefully) prevents us from fucking up the upstream branches.