Merge branch 'master' into single_prodname

This commit is contained in:
Luke Dashjr 2016-02-03 05:41:13 +00:00
commit a68bb9f5e7
532 changed files with 26132 additions and 7549 deletions

View file

@ -1,4 +1,4 @@
// Copyright (c) 2011-2014 The Bitcoin Core developers
// Copyright (c) 2011-2015 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.