Merge with default

This commit is contained in:
vfedosevich 2015-01-05 23:59:15 -08:00
commit c25fb5a029
2725 changed files with 29026 additions and 6831 deletions

View file

@ -1,4 +1,4 @@
// Copyright (c) 2012-2014, Outercurve Foundation.
// Copyright (c) 2015, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,