Merge branch 'master' into core-updates
authorMark H Weaver <mhw@netris.org>
Sat, 22 Mar 2014 15:19:19 +0000 (11:19 -0400)
committerMark H Weaver <mhw@netris.org>
Sat, 22 Mar 2014 15:19:19 +0000 (11:19 -0400)
commit1eefbb2693f0f29f8f095af9f067240b85e735aa
tree35dbaa90de4bb52162b176725aa6ac10d8de0e4f
parentb1a01474ac4f5bae1f2689805105103742178c2b
parent6212b8e5d3f08a3ff05111167f0b190cea800c7c
Merge branch 'master' into core-updates
gnu-system.am
gnu/packages/base.scm
gnu/packages/xorg.scm