Merge tag 'samba-4.0.25' into v4-0-test
authorStefan Metzmacher <metze@samba.org>
Thu, 26 Feb 2015 10:18:38 +0000 (11:18 +0100)
committerStefan Metzmacher <metze@samba.org>
Thu, 26 Feb 2015 10:18:38 +0000 (11:18 +0100)
samba: tag release samba-4.0.25


Trivial merge