Merge commit 2518760dbfec5c7f7281f6ab94eeaa6ae9c598a4
authorBarrucadu <mike@barrucadu.co.uk>
Wed, 20 May 2009 17:51:04 +0000 (18:51 +0100)
committerBarrucadu <mike@barrucadu.co.uk>
Wed, 20 May 2009 17:51:04 +0000 (18:51 +0100)
commita0b4c70ef6d3a3690c22aa29bdb8781fae7bb856
tree3c57f05f9ce2455d7d638765f1741286a1dd949a
parent00301d1846e29f35e2ef3a1bf0af5ddc5be32562
Merge commit 2518760dbfec5c7f7281f6ab94eeaa6ae9c598a4

fixed failing to load argument to --uri

Conflicts:

uzbl.c
uzbl.c