Merge branch 'tj/maint-properly-escape' into next
commit7621bd6d3c1455e5c08d61f1708df6c1f64deb54
authorToni Gundogdu <legatvs@gmail.com>
Mon, 28 Nov 2011 10:26:24 +0000 (28 12:26 +0200)
committerToni Gundogdu <legatvs@gmail.com>
Mon, 28 Nov 2011 10:26:24 +0000 (28 12:26 +0200)
treecd848c36b020a5d54121a67df9ffea7ddf262588
parent44b48472fc5f456f05b79aa87e52a2fc13f7a61a
parent3ac6c466e4720945b817d8edeae16f27025365fa
Merge branch 'tj/maint-properly-escape' into next
src/quvi/quvi.c