Merge commit 'pawelz/experimental' into experimental
authorDieter Plaetinck <dieter@plaetinck.be>
Tue, 25 Aug 2009 20:28:51 +0000 (22:28 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Tue, 25 Aug 2009 20:28:51 +0000 (22:28 +0200)
1  2 
README
uzbl.c

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