Merge branch 'master' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 20 Dec 2015 20:06:32 +0000 (15:06 -0500)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 20 Dec 2015 20:06:32 +0000 (15:06 -0500)
commit1b59d1cfe7ed5c2742559c44ae8a39d4d5d847af
treeb2447c2e906913c5e3e677b9e1398400de0994e8
parent35948676b7390a6061db87f0c4d4d27a6bc6d951
parent28b6c19b50a1ca8ae2529e76a18d00fc173398c3
Merge branch 'master' into for-steve