Merge branch 'master' into hadoop-rdf
authorRob Vesse <rvesse@apache.org>
Wed, 22 Oct 2014 11:34:31 +0000 (12:34 +0100)
committerRob Vesse <rvesse@apache.org>
Wed, 22 Oct 2014 11:34:31 +0000 (12:34 +0100)
commitb32af6cdd6813c73782dd2d98b187f15f1c3dcd2
tree3839bce90de19b2c690c547598de08604d778a08
parent92fb810a44379aa50eba5eaa1ed57fc727b432f2
parent6252acede5822d8ffacec141d20c88028c25836c
Merge branch 'master' into hadoop-rdf

Conflicts:
jena-parent/pom.xml
pom.xml
jena-parent/pom.xml
pom.xml