Merge pull request #17 from ghostwheel42/master

patched to use new NPN API
Merge pull request #18 from eousphoros/master

Sync 2.4.10 with master RE ghostwheel42's npn patch
Merge pull request #20 from ghostwheel42/master

Update mod_spdy.cc - Advertise http again
Don't advertise SPDY/3.1

Stop advertising SPDY/3.1 because we don't actually speak 3.1 yet.
Merge pull request #25 from priyadi/patch-1

Don't advertise SPDY/3.1
Merge remote-tracking branch 'upstream/apache-2.4.10'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/mod_spdy/mod_spdy.cc