git.samba.org / samba.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 85c575d 154a270)
Merge tag 'samba-4.1.11' into v4-1-test samba-4.1.12
authorKarolin Seeger <kseeger@samba.org>
Mon, 8 Sep 2014 09:08:02 +0000 (11:08 +0200)
committerKarolin Seeger <kseeger@samba.org>
Mon, 8 Sep 2014 09:21:03 +0000 (11:21 +0200)
commit6cc1d3030667d2c57cceac870c0d8480cce45905
tree408ae0521bea9251103e0336b92e55b211a086e1tree
parent85c575d311a5b5e2b1ea626b7a706566fd97b3f1commit | diff
parent154a270edb95d5141781bc5e76b4b2dcac1be5e2commit | diff
Merge tag 'samba-4.1.11' into v4-1-test

samba: tag release samba-4.1.11

This commit is actually the samba-4.1.12 release!

It was just forgotten to merge the samba-4.1.11 tag (security release)
into v4-1-test. This commit is required to bring the git history
between v4-1-test and v4-1-stable in sync again.

Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Samba Shared Repository