diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-08 21:58:09 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-08 21:58:09 +0100 |
| commit | 7db9608d52ab431165ab150a0a0707c686990c1c (patch) | |
| tree | b19d49a71e71f8da939a4825b545da3a31907e65 /doc.am | |
| parent | 7a78cc7af24a1303dd0117cb977e15ca89a5dad8 (diff) | |
| parent | 6a9957545ce51e7a50381059d4509d0dfcba0aba (diff) | |
| download | patches-7db9608d52ab431165ab150a0a0707c686990c1c.tar patches-7db9608d52ab431165ab150a0a0707c686990c1c.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
guix/packages.scm
Diffstat (limited to 'doc.am')
0 files changed, 0 insertions, 0 deletions