Merge branch 'master' into core-updates
authorLudovic Courtès <ludo@gnu.org>
Mon, 10 Mar 2014 22:54:17 +0000 (23:54 +0100)
committerLudovic Courtès <ludo@gnu.org>
Mon, 10 Mar 2014 22:54:17 +0000 (23:54 +0100)
commite06f7865e2630494a522ac32b9c0a0311be3e1e2
tree1a547ad3a2e4c1b98a67845a9de0dfc798227b5f
parentff3c0c1b805453990a42f690f148b41b9dff382a
parentc9c88118a12b0e22b7369b1dc6b0e2f9db894986
Merge branch 'master' into core-updates
gnu-system.am
gnu/packages/gnupg.scm