Merge branch 'master' into new_panels_with_context_buttons
authorPekka Nissinen <pekka.nissinen@ixonos.com>
Tue, 24 Aug 2010 09:51:14 +0000 (12:51 +0300)
committerPekka Nissinen <pekka.nissinen@ixonos.com>
Tue, 24 Aug 2010 09:51:14 +0000 (12:51 +0300)
commitd85749c8d7b66d0581d88582c1498f5ebea28bc3
tree9c376288d155a88a165ad4eff26f975838fda8f6
parentdbe039fdd75cfb333c5123bc777a56a32ab9517f
parent8ca3dc296698ae787968b6eee91808036108ef04
Merge branch 'master' into new_panels_with_context_buttons