Merge remote-tracking branch 'github/master' into master-apache
authorSimeon Aladjem <simeon.aladjem@miracl.com>
Wed, 21 Sep 2016 14:31:16 +0000 (17:31 +0300)
committerSimeon Aladjem <simeon.aladjem@miracl.com>
Wed, 21 Sep 2016 14:31:16 +0000 (17:31 +0300)
commita0889dbc5b3e03057a35064c7b6c55661b5f5257
treec44dee9febd6ca87e80abbfe936627aecdb2712e
parenta934e14e1343a45f7df697e95f64a28a2b0569dd
parent0631cff5d1200830bc1651e9799058a3880ab77b
Merge remote-tracking branch 'github/master' into master-apache