From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Wed, 26 Aug 2009 18:04:42 +0000 (+0200)
Subject: Merge commit 'remotes/holizz/bf2'
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=a281f9aa82f4e54ed0c9c5f8ccacb97e0d32fc9d;hp=254e4a473fc96b6418c348fcfdf0a49c30b2a035;p=uzbl-mobile

Merge commit 'remotes/holizz/bf2'
---

diff --git a/AUTHORS b/AUTHORS
index 222b695..89db5fe 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,7 +29,7 @@ Contributors:
     (kmeaw) - fix for multibyte utf8 characters segfault
     (evocallaghan) - tiny patches
     Aaron Griffin (phrakture) - Makefile patches to build on OSX
-    Mason Larobina - os.environ.keys() & os.path.join fix in cookies.py, work on uzbl_tabbed.py
+    Mason Larobina - os.environ.keys() & os.path.join fix in cookies.py, work on uzbl_tabbed.py, cookies_daemon.py
     (dequis) - Uzbl.run, birectional socket, javascript commands
     Brendan Taylor (bct) - various bugfixes, making misc variables much better using expand(), refactoring some internal var stuff
     Chris van Dijk (quigybo) - work on uzbl_tabbed.py