Merge branch 'master' of gitorious.org:kdevelop/kdevplatform
authorDavid nolden <david.nolden.kde@art-master.de>
Sun, 21 Nov 2010 14:47:42 +0000 (15:47 +0100)
committerDavid nolden <david.nolden.kde@art-master.de>
Sun, 21 Nov 2010 14:47:42 +0000 (15:47 +0100)
commit7030c0c791d98702539aa247d95b79956f2e8ac2
treeecd1ac795469a99aaa7a4ebb2443761c6ae10688
parentf871ff0b5445b1e710dac4107d9a1e0c3c486e8a
parentc9198b8fe2b616411433200bdbf5b09b66311335
Merge branch 'master' of gitorious.org:kdevelop/kdevplatform