diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-07-05 12:07:53 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2013-07-05 12:33:34 +0200 |
| commit | a0130c662a40d6951fadae4bd9a6f7c230df05db (patch) | |
| tree | bf54db9466de8bb3c0916344145ee3f8f0bc7c41 | |
| parent | af6d9cebaf3bc4b564952e445af035fe8aece662 (diff) | |
| parent | e56343f1bba603852afcb816f7b5ebdf680c182e (diff) | |
| download | samba-a0130c662a40d6951fadae4bd9a6f7c230df05db.tar.gz samba-a0130c662a40d6951fadae4bd9a6f7c230df05db.tar.bz2 samba-a0130c662a40d6951fadae4bd9a6f7c230df05db.zip | |
Merge remote-tracking branch 'origin/v4-1-test' into master
git merge -s ours origin/v4-1-test
Signed-off-by: Stefan Metzmacher <metze@samba.org>
0 files changed, 0 insertions, 0 deletions