Merge branch '1.1'
authorMilian Wolff <mail@milianw.de>
Tue, 28 Sep 2010 09:57:25 +0000 (11:57 +0200)
committerMilian Wolff <mail@milianw.de>
Tue, 28 Sep 2010 09:57:25 +0000 (11:57 +0200)
commit417afd95a2a1e45dd91a1d4ec088b46b99752dfc
tree418403213cca68468a34638255ac156c7c3f8654
parent3c26e6536459cb2f15b0a96f51080ca8f3bb7237
parent3da8d09c5cc6c1619b0df8982eb7912685b20c5d
Merge branch '1.1'

Conflicts:
app_templates/simple_phpapp/simple_phpapp.kdevtemplate
kdevphpsupport.desktop
phplanguagesupport.cpp
app_templates/simple_phpapp/simple_phpapp.kdevtemplate
kdevphpsupport.desktop