Merge branch 'upstream'

Former-commit-id: e7bc2ce2160572963daa967ada44d8997bf83a6d
This commit is contained in:
Xamarin Public Jenkins
2015-12-18 19:43:16 -05:00
45 changed files with 399 additions and 122 deletions

View File

@@ -1 +1 @@
530bd396504a300e1f44e8bb369913299172f01f
3db9a4bafdb7398647430f25ef9f145d369259ca