Merge commit 'remote/master' into search_reverse
authorPeter Suschlik <peter@suschlik.de>
Sun, 17 May 2009 14:41:00 +0000 (16:41 +0200)
committerPeter Suschlik <peter@suschlik.de>
Sun, 17 May 2009 14:41:00 +0000 (16:41 +0200)
1  2 
examples/configs/sampleconfig-dev
uzbl.c

Simple merge
diff --cc uzbl.c
Simple merge