Merge branch 'master' into JENA-507
authorRob Vesse <rvesse@apache.org>
Mon, 10 Nov 2014 10:52:19 +0000 (10:52 +0000)
committerRob Vesse <rvesse@apache.org>
Mon, 10 Nov 2014 10:52:19 +0000 (10:52 +0000)
commita122afcd8932338ec21f44d161433c56e8fb4e73
tree5c1a8ba45d92bb5dd841a92e90c8010d6da5d592
parent8c80b7858ba315c7c87e8d7b551a0d0b4b7f604f
parent455491582eaf8e744514e393c90d8a8fb9f2c04c
Merge branch 'master' into JENA-507

Bring JENA-507 up to date with master