Merge pull request #1032 from commodo/python-updates
authorSteven Barth <redacted>
Thu, 12 Mar 2015 20:19:52 +0000 (21:19 +0100)
committerSteven Barth <redacted>
Thu, 12 Mar 2015 20:19:52 +0000 (21:19 +0100)
commit3cf51e09378bd961d8215892008270befcd9629a
tree52d2c3c37e78fad7a8f587cefcd09ac551962d4e
parent98be2ca3e0d365d8f1150987cedb145360de582f
parent01eff3fc591fc1b79925cf98d75f3e06b50506f0
Merge pull request #1032 from commodo/python-updates

python: fix conflicts between python-light & python-base
git clone https://git.99rst.org/PROJECT