4pr0n 66671ff552 Merge branch 'master' into hotfix-updater ... Conflicts: pom.xml src/main/java/com/rarchives/ripme/ui/UpdateUtils.java		2014-04-08 23:35:39 -07:00
..
ripme	Merge branch 'master' into hotfix-updater	2014-04-08 23:35:39 -07:00