Merge remote-tracking branch 'shared/master' into leap_master master
authorvarac <varacanero@zeromail.org>
Wed, 16 Mar 2016 21:03:36 +0000 (22:03 +0100)
committervarac <varacanero@zeromail.org>
Wed, 16 Mar 2016 21:03:36 +0000 (22:03 +0100)
commit6c633f8606e04aad29f40a3fc0fcfdcb4b293715
tree63d7c8a54a643cc628b9b4f7a3b941d9f508c4ad
parent503e9296860e4d844a1ee391331996db87e0bfa6
parent87dc315597e8ed27c2e0907615ede8a3f1521b7a
Merge remote-tracking branch 'shared/master' into leap_master