William A. Kennington III ae28ff8b91 Merge branch 'master.upstream' into staging.upstream		2015-07-06 17:15:11 -07:00
..
darwin	make vim frameworks-compliant	2015-06-30 17:34:13 -07:00
gnu	samba: Revert style changes and get rid of some dependencies	2015-06-01 15:35:59 +02:00
linux	Merge branch 'master.upstream' into staging.upstream	2015-07-06 17:15:11 -07:00
windows	libgcrypt: Massive cleanup and make 1.6 the default	2015-05-01 17:41:42 -07:00