Merge remote-tracking branch 'origin/master' into leap_master
authorvarac <varacanero@zeromail.org>
Fri, 13 Jan 2017 11:41:58 +0000 (12:41 +0100)
committervarac <varacanero@zeromail.org>
Fri, 13 Jan 2017 11:41:58 +0000 (12:41 +0100)
commit066c08f8362d53f0f30897cb8710d11260c726ea
treea6369eecd88bb731fe413d0bbc8af73d74d1f447
parent71123634744b9fe2ec7d6a3e38e9789fd84801e3
parentb65dd1f45d10e10e45455358aeabb29167990e2c
Merge remote-tracking branch 'origin/master' into leap_master