Permalink
Browse files

Merge branch 'stable'

* stable:
  set version to 1.5.4

Conflicts:
	pom.xml
  • Loading branch information...
jmesnil committed Jun 16, 2011
2 parents 864a01c + e4f894a commit d61a2e551502af8e2755f3268cbd32171975b475
Showing with 0 additions and 0 deletions.

0 comments on commit d61a2e5

Please sign in to comment.