Merge branch 'master' into extensions
authorNikhil Marathe <nsm.nikhil@gmail.com>
Thu, 28 Oct 2010 20:30:31 +0000 (02:00 +0530)
committerNikhil Marathe <nsm.nikhil@gmail.com>
Thu, 28 Oct 2010 20:30:31 +0000 (02:00 +0530)
commit2020ca015c0db18308f0afd2a65fa89fe830e78a
tree4236cea25efca3e9e9a27641883b139093a6f54c
parentaed99b62e7bbe81d9e4bd2728371bc2e1f46ef27
parentefb6750280d7f759fe56c45081740582f22b1c5d
Merge branch 'master' into extensions

Conflicts:
src/webpage.cpp
src/mainview.cpp
src/mainwindow.cpp
src/webpage.cpp
src/webtab.cpp