From: khizmax <khizmax@gmail.com>
Date: Fri, 3 Apr 2015 13:04:34 +0000 (+0300)
Subject: Merge branch 'integration' into dev
X-Git-Tag: v2.1.0~284
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7a9b165a36a347f447afcc763ad810151490c876;p=libcds.git

Merge branch 'integration' into dev
---

7a9b165a36a347f447afcc763ad810151490c876