From: Steven Barth <steven@midlink.org>
Date: Thu, 12 Mar 2015 20:19:52 +0000 (+0100)
Subject: Merge pull request #1032 from commodo/python-updates
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3cf51e09378bd961d8215892008270befcd9629a;p=feed%2Fpackages.git

Merge pull request #1032 from commodo/python-updates

python: fix conflicts between python-light & python-base
---

3cf51e09378bd961d8215892008270befcd9629a