Merge branch 'master' of git.kde.org:kdevelop
authorOlivier JG <olivier.jg@gmail.com>
Wed, 6 Jul 2011 03:01:00 +0000 (11:01 +0800)
committerOlivier JG <olivier.jg@gmail.com>
Wed, 6 Jul 2011 03:01:00 +0000 (11:01 +0800)
commit08c7804c6fbf7156c375e0fe99371ce6a636dc4a
tree977a306a0f4a8f76c9aeb00165b49e4d0c54a8c3
parent1e7d82145142b948cd42d0e6c035d6b33eb825e1
parent5eee5f966bb14b83f8132a23b8f8ff613f4a60cf
Merge branch 'master' of git.kde.org:kdevelop