Merge commit 'rob/master' into experimental
authorDuClare <akarinotengoku@gmail.com>
Tue, 26 May 2009 18:18:28 +0000 (21:18 +0300)
committerDuClare <akarinotengoku@gmail.com>
Tue, 26 May 2009 18:18:28 +0000 (21:18 +0300)
1  2 
uzbl.c
uzbl.h

diff --cc uzbl.c
Simple merge
diff --cc uzbl.h
Simple merge