From: khizmax <libcds.dev@gmail.com>
Date: Sun, 12 Apr 2015 19:53:16 +0000 (+0300)
Subject: Merge branch 'integration' into dev
X-Git-Tag: v2.1.0~260
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=commitdiff_plain;h=f6e850d5045fe1fad28e440907b0f3b710d7a0be

Merge branch 'integration' into dev
---

f6e850d5045fe1fad28e440907b0f3b710d7a0be