diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 16:39:35 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 16:39:35 +0100 |
commit | 09ac816b36e45fd537af2f7fe7c57a11f5c744f5 (patch) | |
tree | 4d5d44c27a2395a39efc62359f6e4b6976f2ba2e /docs-xml/archives/THANKS | |
parent | 235244f4cc707130dd130afce88bde49606bd501 (diff) | |
parent | 54bc27e9374742d37b1ed9012d1cfe8f5ace6d40 (diff) | |
download | samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.tar.gz samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.tar.bz2 samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.zip |
Merge branch 'master' of git://git.samba.org/samba into teventfix
Conflicts:
lib/tevent/pytevent.c
Diffstat (limited to 'docs-xml/archives/THANKS')
-rw-r--r-- | docs-xml/archives/THANKS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs-xml/archives/THANKS b/docs-xml/archives/THANKS index 789042f78e..37ecc99eeb 100644 --- a/docs-xml/archives/THANKS +++ b/docs-xml/archives/THANKS @@ -86,7 +86,7 @@ Tom Haapanen (tomh@metrics.com) consulting firm located in Waterloo, Ontario, Canada. We work with a variety of environments (such as Windows, Windows NT and Unix), tools and application areas, and can provide assistance for - development work ranging from a few days to to multiple man-year + development work ranging from a few days to multiple man-year projects. You can find more information at http://www.metrics.com/. |