projects / feed / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98be2ca 01eff3f)
Merge pull request #1032 from commodo/python-updates
authorSteven Barth <steven@midlink.org>
Thu, 12 Mar 2015 20:19:52 +0000 (21:19 +0100)
committerSteven Barth <steven@midlink.org>
Thu, 12 Mar 2015 20:19:52 +0000 (21:19 +0100)
python: fix conflicts between python-light & python-base


Trivial merge
Mirror of packages feed