Merge branch 'master' into task-stuff

This commit is contained in:
Gian Merlino 2013-02-14 15:11:40 -08:00
commit dd44f5cbf0
1 changed files with 1 additions and 1 deletions

View File

@ -175,7 +175,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.1.3</version>
<version>2.1.4-mmx-2</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>