Merge branch 'master' into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:23:05 +0000 (00:23 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 17 Mar 2014 00:23:05 +0000 (00:23 +0000)
commitac265d3d008328b9bdaf00c39ebcd86f263605c7
tree777819f4898b3b18dd9d8f71c9146d2dc72f4f95
parent2e93ca3670e5581b5523f60130b38594de10d6c3
parent228c3f410a7b3a9ad1d6b0186dc185d69ec0f52c
Merge branch 'master' into 1.0
test/encryption_test.cc