Merge remote branch 'upstream/master'

This commit is contained in:
Brant K. Kyser 2013-01-05 06:00:21 -06:00
commit a0685d2dc4
7 changed files with 143 additions and 10 deletions

2
.gitignore vendored
View file

@ -77,4 +77,4 @@ Examples/test-suite/python/*/
Examples/test-suite/r/*/
Examples/test-suite/ruby/*/
Examples/test-suite/tcl/*/
Examples/test-suite/uffi/*/
Examples/test-suite/uffi/*/