Merge branch '1.1'
authorMilian Wolff <mail@milianw.de>
Fri, 17 Sep 2010 21:14:33 +0000 (23:14 +0200)
committerMilian Wolff <mail@milianw.de>
Fri, 17 Sep 2010 21:14:33 +0000 (23:14 +0200)
commitc851a48cebf33d31322354979a35793552f33c38
treebae0f35eb6472d378de10b623af5f330a1568151
parent44e51853ec76e690db5ebdb15bac35833ff11d04
parent1678bf0466ae6036f1dccefb7e5fd9f61cba25b4
Merge branch '1.1'
kdevphpdocs.desktop