Merge branch 'master' into core-updates
commitbf4af30bb2bce9dd5baf91f313ea35c55893eb10
authorLudovic Courtès <ludo@gnu.org>
Fri, 1 May 2015 13:03:30 +0000 (1 15:03 +0200)
committerLudovic Courtès <ludo@gnu.org>
Fri, 1 May 2015 13:03:30 +0000 (1 15:03 +0200)
tree94aa42278cd88cb50304e7fe34854399fc5255af
parent9e63a388d91f73e2b82f8c4688f131680fe5f165
parentbc7d089a9cb5ce843730f863cc03195168a956b9
Merge branch 'master' into core-updates
gnu-system.am
gnu/packages/audio.scm