Merge branch '1.0'
authorMilian Wolff <mail@milianw.de>
Sat, 17 Jul 2010 20:25:42 +0000 (22:25 +0200)
committerMilian Wolff <mail@milianw.de>
Sat, 17 Jul 2010 20:25:42 +0000 (22:25 +0200)
commit8dd629ea23016af912cf6d44a35f469663ba4e00
tree46558008fd3ac14772e24043309b484dc39ba97a
parenteea7b9cfb8f307d1233d6dd4d3f0d1d67bcdd083
parentd969ef23b784f3d374703571f1c5308d4230272c
Merge branch '1.0'

Conflicts:
kdevphpdocs.desktop
kdevphpdocs_config.desktop
kdevphpdocs.desktop