[Swan-commit] Changes to ref refs/heads/master

[Paul Wouters]

New commits:
commit 6e228af47b4e44b89012f2158dcb33e13b7dc1e0
Author: Paul Wouters <pwouters at redhat.com>
Date:   Sat Oct 18 17:44:05 2014 -0400

    remove bogus empty whack line from merge conflict