Merge branch 'shyba/feat/twisted_http_get' into develop
authorRuben Pollan <meskio@sindominio.net>
Tue, 2 Jun 2015 22:29:13 +0000 (00:29 +0200)
committerRuben Pollan <meskio@sindominio.net>
Tue, 2 Jun 2015 22:29:13 +0000 (00:29 +0200)

Trivial merge