From: khizmax <khizmax@gmail.com>
Date: Mon, 30 Mar 2015 11:38:59 +0000 (+0300)
Subject: Merge branch 'integration' into dev
X-Git-Tag: v2.1.0~293
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=357509b3ac41bb8a7c86678f982a9c6f4b5c1910;p=libcds.git

Merge branch 'integration' into dev
---

357509b3ac41bb8a7c86678f982a9c6f4b5c1910