Merge release-5-0 into master
authorChristoph Junghans <junghans@votca.org>
Wed, 26 Nov 2014 22:18:01 +0000 (15:18 -0700)
committerChristoph Junghans <junghans@votca.org>
Wed, 26 Nov 2014 22:19:45 +0000 (15:19 -0700)
commitec4e8d4beb49cff1e55074bc8990f272fdc0856a
treefdd6a4e1b605f3b4a8d0bca258c578b9701bc754
parentccd8bc32ce227d0aba7550a02748f5951fa6d250
parent5012852e7f6a3b7ad84117d69b6a5554c1aee166
Merge release-5-0 into master

Change-Id: If41f9c458e5d3aa5f841afcd71bc7f72a1f312c7
CMakeLists.txt