Merge branch 'master' of https://github.com/dalf/searx - searx - My custom branche(s) on searx, a meta-search engine

commit: c4dd7c3a549e238c82a3274bb66ba17386076a10
parent 9db0bbc30421cec9d42438ccab748439eea60105
Author: dalf <alex@al-f.net>
Date:   Thu, 12 Feb 2015 14:33:28 +0100

Merge branch 'master' of https://github.com/dalf/searx