Merge with 3.6

2016-09-12 17:38:45 -04:00 · 2016-09-12 17:38:45 -04:00 · b1191923ad
parent 4829bc6619 d35ee0b9cd
commit b1191923ad
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -230,3 +230,4 @@ so it may be used in proprietary projects.  There are interfaces to some GNU
 code but these are entirely optional.

 All trademarks referenced herein are property of their respective holders.
+