Merge branch 'context-menu'
commit66ccb5ba39b1d178e38642c94b5f6f6565ecc213
authorSven Strickroth <email@cs-ware.de>
Sat, 1 Oct 2011 13:47:05 +0000 (1 15:47 +0200)
committerSven Strickroth <email@cs-ware.de>
Sat, 1 Oct 2011 13:47:05 +0000 (1 15:47 +0200)
tree00f90b294d6b21fe946162e948b7e2e4d0061ab4
parent4b106b8d2a3a47ad6b4ecd8e53754ab3216cda9a
parent62802eed9ca12ee930c94f7ec5f7a44ae7d674d5
Merge branch 'context-menu'

Signed-off-by: Sven Strickroth <email@cs-ware.de>