Merge branch '1.1'
authorMilian Wolff <mail@milianw.de>
Mon, 27 Sep 2010 12:51:10 +0000 (14:51 +0200)
committerMilian Wolff <mail@milianw.de>
Mon, 27 Sep 2010 12:51:10 +0000 (14:51 +0200)
commite0a88a69965daee3e43e5b1905df68c1312a807a
treeefffbf81167c1060149c2b99a74fc2f0d0291672
parent4151da243ba1067b72baed33fcc179dd637adbd4
parentc66315fc0e7dcb132891dc86ffa158496d0f2e1a
Merge branch '1.1'

Conflicts:
plugins/git/kdevgit.desktop
plugins/git/kdevgit.desktop