pentaho/marketplace — pull request #19 by e-cuellar (2013-10-08 18:20:27+00:00)
Title:  Merge branch 'master' into 5.0

Conflicts:
build.properties
package-res/resources/lib/nivo-slider/jquery.nivo.slider.js
src/org/pentaho/marketplace/Util.java
src/org/pentaho/marketplace/VersionData.java
test-src/org/pentaho/marketplace/VersionDataTest.java