Merge tag 'upstream/0.0.11' into debian
authorJelmer Vernooij <jelmer@samba.org>
Sat, 1 Mar 2014 18:02:57 +0000 (18:02 +0000)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 1 Mar 2014 18:02:57 +0000 (18:02 +0000)
Upstream version 0.0.11


Trivial merge