Merge branch 'dev'

.travis.yml

@@ -9,3 +9,6 @@ smalltalk:
   - GemStone-3.1.0.6
   - GemStone-3.2.12
   - GemStone-3.3.0
+cache:
+  directories:
+    - $SMALLTALK_CI_CACHE

repository/Grease-Core.package/GRPackage.class/instance/resolveWith..st

@@ -11,4 +11,6 @@ resolveWith: aDictionary
 						aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo30-') ifAbsent: [
 							"try -Pharo40-"
 							aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo40-') ifAbsent: [
-								self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ]
+								"try -Pharo50-"
+								aDictionary at: (each copyReplaceAll: '-Pharo-' with: '-Pharo50-') ifAbsent: [
+									self error: self name printString , ' depends on unknown package ' , each printString ] ] ] ] ] ] ]

repository/Grease-Core.package/GRPackage.class/methodProperties.json

@@ -18,7 +18,7 @@
 		"name" : "lr 2/17/2010 15:18",
 		"name:" : "lr 10/25/2009 11:26",
 		"printOn:" : "merged 10/20/2008 09:24",
-		"resolveWith:" : "jok 8/23/2014 10:59",
+		"resolveWith:" : "JohanBrichau 3/26/2016 15:54",
 		"seasideAddonsUrl" : "pmm 9/12/2013 15:59",
 		"seasideLGPLUrl" : "pmm 9/12/2013 15:59",
 		"seasideUrl" : "pmm 9/12/2013 15:58",

repository/Grease-Core.package/monticello.meta/categories.st

@@ -1,5 +1,5 @@
 SystemOrganization addCategory: #'Grease-Core'!
-SystemOrganization addCategory: #'Grease-Core-Collections'!
-SystemOrganization addCategory: #'Grease-Core-Exceptions'!
-SystemOrganization addCategory: #'Grease-Core-Text'!
-SystemOrganization addCategory: #'Grease-Core-Utilities'!
+SystemOrganization addCategory: 'Grease-Core-Collections'!
+SystemOrganization addCategory: 'Grease-Core-Exceptions'!
+SystemOrganization addCategory: 'Grease-Core-Text'!
+SystemOrganization addCategory: 'Grease-Core-Utilities'!