Merge branch 'master' into python2and3
authorMichael Pratt <michael@pratt.im>
Wed, 6 Aug 2014 05:45:07 +0000 (01:45 -0400)
committerarc <arc@cthulhu>
Wed, 6 Aug 2014 05:45:07 +0000 (01:45 -0400)
commit218b12c55756780ccd2b886181e977005ce7c698
treeb500b84316ca9fadd59b6473347cecafb7b57f72
parent52df3b232d87e5b144c37f4c89af2e8e1f1ff5c7
parentd2f1c00719383e9c42a4ff36f99babae910af64b
Merge branch 'master' into python2and3
modules/java/CMakeLists.txt
modules/python/common.cmake