Merge branch '1.1'
authorAleix Pol <aleixpol@kde.org>
Mon, 22 Nov 2010 02:59:04 +0000 (03:59 +0100)
committerAleix Pol <aleixpol@kde.org>
Mon, 22 Nov 2010 02:59:04 +0000 (03:59 +0100)
commitf98db2eb096ff5af253376fa06aef9b29a5357f1
tree0a5cccf4879c6f8a0e83c2da0522d351c6d42a43
parent74391ea9ee663434a9c0af28f09f20d769cbb53b
parent4b50220a8fde7b4c1ac200ceeb706e78bcb1c896
Merge branch '1.1'

Conflicts:
plugins/git/gitplugin.cpp
interfaces/iplugin.h
plugins/git/gitplugin.cpp