01/01: Merge branch 'master' into sqlite-update

[Mark H. Weaver]

mhw pushed a commit to branch sqlite-update
in repository guix.

commit 808355c1a5b76ef5bb16e95e4cc9c4f26ee16250
Merge: c84fd4a f4d8f85
Author: Mark H Weaver <address@hidden>
Date:   Thu May 7 14:47:58 2015 -0400

    Merge branch 'master' into sqlite-update

 doc/guix.texi                                      |   15 +++
 gnu-system.am                                      |    3 +
 gnu/packages/linux.scm                             |   11 ++
 gnu/packages/patches/serf-comment-style-fix.patch  |   23 ++++
 .../patches/serf-deflate-buckets-test-fix.patch    |   69 +++++++++++
 gnu/packages/vpn.scm                               |   31 +++++
 gnu/packages/web.scm                               |   12 +--
 gnu/services/databases.scm                         |  121 ++++++++++++++++++++
 8 files changed, 277 insertions(+), 8 deletions(-)