Merge commit 'a9213ce45072f66144284647ccae242f91ca30af' into dev

author khizmax <libcds.dev@gmail.com>

Wed, 25 Feb 2015 20:16:17 +0000 (23:16 +0300)

committer khizmax <libcds.dev@gmail.com>

Wed, 25 Feb 2015 20:16:17 +0000 (23:16 +0300)
author khizmax <libcds.dev@gmail.com>
Wed, 25 Feb 2015 20:16:17 +0000 (23:16 +0300)
committer khizmax <libcds.dev@gmail.com>
Wed, 25 Feb 2015 20:16:17 +0000 (23:16 +0300)
diff --cc cds/container/bronson_avltree_map_rcu.h
Simple merge
diff --cc cds/container/impl/bronson_avltree_map_rcu.h
Simple merge
author	khizmax <libcds.dev@gmail.com>
	Wed, 25 Feb 2015 20:16:17 +0000 (23:16 +0300)
committer	khizmax <libcds.dev@gmail.com>
	Wed, 25 Feb 2015 20:16:17 +0000 (23:16 +0300)
		1	2
cds/container/bronson_avltree_map_rcu.h	patch \|	diff1 \|	diff2 \|	blob \| history
cds/container/impl/bronson_avltree_map_rcu.h	patch \|	diff1 \|	diff2 \|	blob \| history