Merge remote-tracking branch 'origin/master' into for-steve
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 14 Jun 2015 14:07:33 +0000 (10:07 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 14 Jun 2015 14:07:33 +0000 (10:07 -0400)
commit8169c5886ae90461017c67b917566d519600f285
treee9f18c84bf59f3c43517b43cd3b9a4a34f9b4e65
parent74a31d33deff58c3b6aa664b3b43ccd53d567426
parent82008a117980636406a20d417ca5197d003557c8
Merge remote-tracking branch 'origin/master' into for-steve