1.0/dev-BUG09 FIX: Remove unwanted string
Merge branch '1.0/dev'
1.2/dev-BUG42 Category Pinnacle Done
1.2/dev-BUG42 Fix unapplied changes
Merge branch '1.0/dev-BUG01' into 1.0/dev

Conflicts:
	includes/specials/SpecialSearch.php
1.0/dev-BUG34 added parameter for login
Merge branch '1.0/dev'

Conflicts:
	skins/BlueSpiceSkin/BlueSpiceSkin.skin.php
1.3/dev-BUG46 Bluespice Mobile Version Disabled
Merge branch '1.0/dev'

Conflicts:
	skins/BlueSpiceSkin/BlueSpiceSkin.skin.php
Merge branch 'master' of https://github.com/MediaWiki/MediaWiki-Pinnacle

Conflicts:
	skins/BlueSpiceSkin/BlueSpiceSkin.skin.php