Merge branch 'master' into new_panels_with_context_buttons
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 20 Aug 2010 09:25:16 +0000 (12:25 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Fri, 20 Aug 2010 09:25:16 +0000 (12:25 +0300)
commit58a20e36a4ed7f353b00ec9294168b5082393959
treeca562284e31414f04b52e067fddfcd2c27880ff8
parent2d9a0f4c0d7c30f906639a2c7158aa3f8665e2fa
parent269154622582e5ba8207b41ed17695a3ce118001
Merge branch 'master' into new_panels_with_context_buttons

Conflicts:
src/ui/userinfo.cpp
src/ui/userinfo.cpp