diff options
author | Andrew Bartlett <abartlet@samba.org> | 2009-12-01 16:12:53 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2009-12-01 16:12:53 +1100 |
commit | 183ea8220a2832b2b12d92219f9bd040dbe82772 (patch) | |
tree | 06d80dd233d3b43a018586a303d8291a3fd270cf /docs-xml/Samba.desktop | |
parent | d58413d3314bc245c6be6499bea40cca0ab3d242 (diff) | |
parent | 83c106e084876ee82c66a165a7b02c7702c752f4 (diff) | |
download | samba-183ea8220a2832b2b12d92219f9bd040dbe82772.tar.gz samba-183ea8220a2832b2b12d92219f9bd040dbe82772.tar.bz2 samba-183ea8220a2832b2b12d92219f9bd040dbe82772.zip |
Merge commit 'origin/master' into abartlet-devel
Diffstat (limited to 'docs-xml/Samba.desktop')
0 files changed, 0 insertions, 0 deletions