support for -DGEOSERVER_CONSOLE_DISABLED=true to disable geoserver web console
Add option to override expire clients for tile layer
Handmade merge with http://jira.codehaus.org/browse/GEOS-6020
Merge branch 'master' into expireClients
Default JDBCConfig to disabled
JDBCConfig documentation updates
Merge branch 'master' of https://github.com/geoserver/geoserver into expireClients
Forgot to unset transient members from patch
Update web.xml

add JSONP Config
Merge pull request #371 from g3o/patch-1

Update web.xml
add LDAP config

adds a section for configuring ORACLE ds with LDAP and referrals (if needed)
Merge pull request #369 from smithkm/jdbcconfig

JDBCConfig disabled by default
GEOS-6006: add filter to remove "Request=GetMap" when called against animator
GEOS-6092: WFS 2.0 GetFeature ignores the feature bounding settings
Merge pull request #315 from sweco-sebhar/expireClients

Add option to override expire clients for tile layer
Add wfs-notification module from 2.4 to master.
Merge pull request #372 from g3o/patch-2

add LDAP config
Merge pull request #374 from dustinparker/wfs-notification-master

Add wfs-notification module from 2.4 to master.
Add ORACLE DDL
Merge pull request #375 from g3o/master

Add ORACLE DDL to Docu for FID management