Merge branch 'maint-rel-1.6' into develop

2013-12-04 13:29:55 -05:00 · 2013-12-04 13:29:55 -05:00 · 6f5a922034
commit 6f5a922034
parent 8377b4502e f56d87d7f6
4 changed files with 1 additions and 1 deletions
--- a/doc/3rd-party-licenses.txt
+++ b/doc/3rd-party-licenses.txt
@ -23,10 +23,10 @@ csv
 dwr
 ezmorph
 gson
 jakarta-jstl
 jackson-annotations-2.3.0
 jackson-core-2.3.0
 jackson-databind-2.3.0
 jakarta-jstl
 jarjar
 jmeter
 joda-time
--- a/lib/jackson-annotations-2.3.0.jar
+++ b/lib/jackson-annotations-2.3.0.jar
--- a/lib/jackson-core-2.3.0.jar
+++ b/lib/jackson-core-2.3.0.jar
--- a/lib/jackson-databind-2.3.0.jar
+++ b/lib/jackson-databind-2.3.0.jar