Merge remote-tracking branch 'origin/master' into leap_master
authorvarac <varacanero@zeromail.org>
Fri, 14 Jun 2013 18:36:35 +0000 (20:36 +0200)
committervarac <varacanero@zeromail.org>
Fri, 14 Jun 2013 18:36:35 +0000 (20:36 +0200)
commit1a12adc97d70224a0e750c6ab8a41073ced72d2b
treec6c00ece73c7ddb9813869e2b10b6a862e26c035
parent9b2e9699885497612fbc5d70363611ad51383f96
parenta4b8195e7a5d444448b3750d66ec725d6f7c67ab
Merge remote-tracking branch 'origin/master' into leap_master