Merge branch 'single-client'
authorDaniel Carl <danielcarl@gmx.de>
Wed, 13 Mar 2013 23:54:28 +0000 (00:54 +0100)
committerDaniel Carl <danielcarl@gmx.de>
Wed, 13 Mar 2013 23:54:28 +0000 (00:54 +0100)
commite433d62292766d885b2d565371a696d45be7cd4b
treef8e6c34f953cefc5f759550469a15260fc03815e
parent794ddadb3a49f77f78009253e6bd87054452c528
parent942d3957348f714daa0526aea9b9b8071bfe1868
Merge branch 'single-client'

Conflicts:
src/url_history.c
src/completion.c