tree 9fa6b657e9d0b8617cd00173e8b5f599ba56d1f2
parent 4028df12ca1f162d13a60c7199766adb6ad78dea
parent 43780f6c78b6be4f9825e6fe926e0a20aa988349
author Greg Wilkins <gregw@webtide.com> 1432292763 +1000
committer Greg Wilkins <gregw@webtide.com> 1432292763 +1000

Merge remote-tracking branch 'origin/jetty-9.2.x'

Conflicts:
	jetty-osgi/jetty-osgi-alpn/pom.xml
	pom.xml