Merge branch 'master' of git://github.com/jml/swarm master
authorJelmer Vernooij <jelmer@samba.org>
Sat, 16 Aug 2014 18:54:21 +0000 (20:54 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 16 Aug 2014 18:54:21 +0000 (20:54 +0200)

Trivial merge