Merge branch 'master' into stable

Makefile

@@ -69,6 +69,10 @@ qtest: qtest-clean build
 	@echo
 	./qtest_all.native
 
+push-stable: all
+	git checkout stable && git merge master && oasis setup && \
+	git commit -a 'oasis'
+
 test-all: test qtest
 
 tags:

string/CCString.ml

@@ -28,6 +28,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 type t = string
 
+let equal a b = a=b
+
+let compare = String.compare
+
+let hash s = Hashtbl.hash s
+
 type 'a gen = unit -> 'a option
 type 'a sequence = ('a -> unit) -> unit
 

string/CCString.mli

@@ -29,6 +29,12 @@ Consider using KMP instead. *)
 
 type t = string
 
+val equal : t -> t -> bool
+
+val compare : t -> t -> int
+
+val hash : t -> int
+
 type 'a gen = unit -> 'a option
 type 'a sequence = ('a -> unit) -> unit