Merge remote-tracking branch 'shared/master' into leap_master
authorvarac <varacanero@zeromail.org>
Wed, 24 Feb 2016 08:18:31 +0000 (09:18 +0100)
committervarac <varacanero@zeromail.org>
Wed, 24 Feb 2016 08:18:31 +0000 (09:18 +0100)
commit79e874c1a86ad5c48c4e726a5d4c68bd879ce454
tree97e0916feed9ecc764ef45f3578fee89ff0b0f5b
parent3bb4d2667be274ba51eb3d8442e55c98789a4d76
parent996043d73fedd2ff7d8c58eec3d6a639a86ce623
Merge remote-tracking branch 'shared/master' into leap_master