From: Robert Manea <gotmor@gmail.com>
Date: Tue, 16 Jun 2009 07:59:59 +0000 (+0200)
Subject: fix conflicts
X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=b69be185c01329f7c29d28eb137ef19f19b5f7ab;p=uzbl-mobile

fix conflicts
---

b69be185c01329f7c29d28eb137ef19f19b5f7ab