Joakim Erdfelt 3357162cc6 Merge branch 'jetty-9.3.x'
Conflicts:
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
	jetty-security/src/main/java/org/eclipse/jetty/security/JDBCLoginService.java
2015-11-30 11:31:58 -07:00
..
2015-11-30 11:31:58 -07:00
2015-11-06 12:13:00 -07:00