| commit | fcc634b483255bedf53f3aea40334c018e13dcce | |
| author | Karolin Seeger <kseeger@samba.org> | |
| Mon, 28 Jul 2014 07:13:45 +0000 (28 09:13 +0200) | ||
| committer | Karolin Seeger <kseeger@samba.org> | |
| Mon, 28 Jul 2014 07:18:00 +0000 (28 09:18 +0200) | ||
| tree | 7d59833bd515e295e70ec188e1aa2b1436b3355c | treesnapshot (tar.gz zip) |
| parent | 97d7291d12e803076022d71556c792b0cd4e60e8 | commitdiff |
| parent | 80a1dfddf9086700a8de5fd6005a9179b0bb3d9e | commitdiff |
Merge commit 'origin/v4-1-test^' into v4-1-stable
This was needed because of a changed commit message (fixed version number)
in v4-1-stable after generating the 'samba-4.1.9' tag.
Karolin
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
This was needed because of a changed commit message (fixed version number)
in v4-1-stable after generating the 'samba-4.1.9' tag.
Karolin
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>