Merge branch 'master' of git.kde.org:kdevelop
authorOlivier JG <olivier.jg@gmail.com>
Fri, 17 Jun 2011 02:07:23 +0000 (10:07 +0800)
committerOlivier JG <olivier.jg@gmail.com>
Fri, 17 Jun 2011 02:07:23 +0000 (10:07 +0800)
commit05602f111aaeeb2e01b18141dd6cca7e1c0045c9
tree846383426850fa3e5705885c04f8900f2b75a7b6
parentfe266924e45ea4a8cdab6aa5c3e865fa722d0ea8
parent0b2b8e2fe44f887d0432c31678edc3566ff0882c
Merge branch 'master' of git.kde.org:kdevelop