Merge branch 'python'
authorAndreas Enge <andreas@enge.fr>
Sat, 14 Sep 2013 08:45:01 +0000 (10:45 +0200)
committerAndreas Enge <andreas@enge.fr>
Sat, 14 Sep 2013 08:45:01 +0000 (10:45 +0200)
1  2 
gnu/packages/glib.scm
gnu/packages/xorg.scm

Simple merge
Simple merge