Commit Graph

11599 Commits

Author SHA1 Message Date
Peter Simons
630586c605 perlPackages.NumberCompare: update from 0.01 to 0.03 2014-04-08 13:25:07 +02:00
Peter Simons
0c5d9983bf perlPackages.NetSSLeay: update from 1.52 to 1.58 2014-04-08 13:25:07 +02:00
Peter Simons
97e5d3c0d0 perlPackages.NetSMTP: update from 1.22 to 1.25 2014-04-08 13:25:07 +02:00
Peter Simons
2a1b8bc26a perlPackages.NetOpenIDConsumer: update from 1.13 to 1.15 2014-04-08 13:25:06 +02:00
Peter Simons
d94a1ee167 perlPackages.NetOpenIDCommon: update from 1.14 to 1.18 2014-04-08 13:25:06 +02:00
Peter Simons
acf86052dd perlPackages.NetLDAP: update from 0.43 to 0.4001 2014-04-08 13:25:06 +02:00
Peter Simons
c168ae1bbf perlPackages.NetHTTP: update from 6.05 to 6.06 2014-04-08 13:25:06 +02:00
Peter Simons
8da8abba86 perlPackages.NetDNS: update from 0.63 to 0.74 2014-04-08 13:25:06 +02:00
Peter Simons
470adc4acf perlPackages.NetAmazonS3Policy: update from 0.1.2 to 0.1.6 2014-04-08 13:25:06 +02:00
Peter Simons
11979f6cfa perlPackages.NetAddrIP: update from 4.071 to 4.072 2014-04-08 13:25:06 +02:00
Peter Simons
f4b043b8e0 perlPackages.MooseXTypesURI: update from 0.03 to 0.05 2014-04-08 13:25:06 +02:00
Peter Simons
e6b6a0d4fc perlPackages.MooseXTypesStructured: update from 0.28 to 0.30 2014-04-08 13:25:06 +02:00
Peter Simons
1538094756 perlPackages.MooseXTypesStringlike: update from 0.001 to 0.002 2014-04-08 13:25:06 +02:00
Peter Simons
cd94d0198f perlPackages.MooseXTypesPerl: update from 0.101341 to 0.101343 2014-04-08 13:25:06 +02:00
Peter Simons
49df464bf4 perlPackages.MooseXTraitsPluggable: update from 0.10 to 0.12 2014-04-08 13:25:06 +02:00
Peter Simons
48cf24ace0 perlPackages.MooseXRoleParameterized: update from 1.00 to 1.02 2014-04-08 13:25:06 +02:00
Peter Simons
6bfd49596c perlPackages.MooseXOneArgNew: update from 0.003 to 0.004 2014-04-08 13:25:06 +02:00
Peter Simons
6678e8e1a3 perlPackages.MooseXNonMoose: update from 0.22 to 0.26 2014-04-08 13:25:06 +02:00
Peter Simons
82457b53b4 perlPackages.MooseXConfigFromFile: update from 0.11 to 0.13 2014-04-08 13:25:05 +02:00
Peter Simons
f7a2bc48dd perlPackages.MooseXAliases: update from 0.10 to 0.11 2014-04-08 13:25:05 +02:00
Peter Simons
0e7425ce28 perlPackages.MooseAutobox: update from 0.13 to 0.15 2014-04-08 13:25:05 +02:00
Peter Simons
aa1a352064 perlPackages.ModuleRuntime: update from 0.013 to 0.014 2014-04-08 13:25:05 +02:00
Peter Simons
c6dc49d29b perlPackages.ModulePluggableFast: update from 0.18 to 0.19 2014-04-08 13:25:05 +02:00
Peter Simons
bce3f0f708 perlPackages.ModulePluggable: update from 4.8 to 5.1 2014-04-08 13:25:05 +02:00
Peter Simons
f6eb58826f perlPackages.ModulePath: update from 0.09 to 0.13 2014-04-08 13:25:05 +02:00
Peter Simons
7b89b37781 perlPackages.ModuleImplementation: update from 0.06 to 0.07 2014-04-08 13:25:05 +02:00
Peter Simons
ea1fcba63c perlPackages.ModuleFind: update from 0.11 to 0.12 2014-04-08 13:25:05 +02:00
Peter Simons
8b8a07ed17 perlPackages.ModuleBuildWithXSpp: update from 0.13 to 0.14 2014-04-08 13:25:05 +02:00
Peter Simons
f79624df5a perlPackages.MathPlanePath: update from 101 to 114 2014-04-08 13:25:05 +02:00
Peter Simons
4c217a5094 perlPackages.MailTools: update from 2.04 to 2.13 2014-04-08 13:25:05 +02:00
Peter Simons
96fb4dbb5b perlPackages.MailIMAPClient: update from 2.2.9 to 3.35 2014-04-08 13:25:05 +02:00
Peter Simons
7bc7132ddf perlPackages.LogDispatchouli: update from 2.006 to 2.009 2014-04-08 13:25:05 +02:00
Peter Simons
b79bfc7de1 perlPackages.LogDispatchArray: update from 1.002 to 1.003 2014-04-08 13:25:04 +02:00
Peter Simons
21d3c04e80 perlPackages.LogContextual: update from 0.005003 to 0.006003 2014-04-08 13:25:04 +02:00
Peter Simons
70c85b5d7a perlPackages.Log4Perl: update from 1.41 to 1.43 2014-04-08 13:25:04 +02:00
Peter Simons
f52121cab0 perlPackages.LockFileSimple: update from 0.207 to 0.208 2014-04-08 13:25:04 +02:00
Peter Simons
7d76f2c4b0 perlPackages.LocaleMaketextSimple: update from 0.18 to 0.21 2014-04-08 13:25:04 +02:00
Peter Simons
25f3995666 perlPackages.LocaleMaketext: update from 1.13 to 1.23 2014-04-08 13:25:04 +02:00
Peter Simons
34e0eb81be perlPackages.LinguaENTagger: update from 0.23 to 0.24 2014-04-08 13:25:04 +02:00
Peter Simons
eaf4f0c7c7 perlPackages.LWPxParanoidAgent: update from 1.07 to 1.10 2014-04-08 13:25:04 +02:00
Peter Simons
b4c012700f perlPackages.LWPUserAgent: update from 6.04 to 6.05 2014-04-08 13:25:04 +02:00
Peter Simons
02fce7df41 perlPackages.JSONXS: update from 2.33 to 2.34 2014-04-08 13:25:04 +02:00
Peter Simons
67b484af45 perlPackages.IPCRun3: update from 0.046 to 0.048 2014-04-08 13:25:04 +02:00
Peter Simons
798a139bd3 perlPackages.IOTieCombine: update from 1.002 to 1.004 2014-04-08 13:25:04 +02:00
Peter Simons
5a74c9e87a perlPackages.IODigest: update from 0.10 to 0.11 2014-04-08 13:25:04 +02:00
Peter Simons
811474227f perlPackages.IOCaptureOutput: update from 1.1102 to 1.1103 2014-04-08 13:25:04 +02:00
Peter Simons
6d394b5177 perlPackages.IOAll: update from 0.50 to 0.60 2014-04-08 13:25:04 +02:00
Peter Simons
8aef65dc04 perlPackages.HookLexWrap: update from 0.22 to 0.24 2014-04-08 13:25:04 +02:00
Peter Simons
aa3278dd1f perlPackages.HashUtilFieldHashCompat: update from 0.03 to 0.07 2014-04-08 13:25:03 +02:00
Peter Simons
771c5e5658 perlPackages.HashMultiValue: update from 0.13 to 0.15 2014-04-08 13:25:03 +02:00
Peter Simons
3dd6683cb2 perlPackages.HashMerge: update from 0.12 to 0.200 2014-04-08 13:25:03 +02:00
Peter Simons
b8487aeb80 perlPackages.HTTPParserXS: update from 0.14 to 0.16 2014-04-08 13:25:03 +02:00
Peter Simons
8d185a638b perlPackages.HTTPLite: update from 2.4 to 2.43 2014-04-08 13:25:03 +02:00
Peter Simons
dfd408338c perlPackages.HTMLTemplate: update from 2.9 to 2.95 2014-04-08 13:25:03 +02:00
Peter Simons
c9e26b0632 perlPackages.HTMLSelectorXPath: update from 0.15 to 0.16 2014-04-08 13:25:03 +02:00
Peter Simons
21cbb9eede perlPackages.HTMLFormHandler: update from 0.40055 to 0.40056 2014-04-08 13:25:03 +02:00
Peter Simons
08be8f66ec perlPackages.Graph: update from 0.94 to 0.96 2014-04-08 13:25:03 +02:00
Peter Simons
223edd8fe4 perlPackages.GoogleProtocolBuffers: update from 0.08 to 0.11 2014-04-08 13:25:03 +02:00
Peter Simons
0799fc8cb2 perlPackages.FreezeThaw: update from 0.43 to 0.5001 2014-04-08 13:25:03 +02:00
Peter Simons
17fd0cc414 perlPackages.ForksSuper: update from 0.67 to 0.72 2014-04-08 13:25:03 +02:00
Peter Simons
f964d637f7 perlPackages.FontTTF: update from 0.43 to 0.48 2014-04-08 13:25:03 +02:00
Peter Simons
93e50bec8c perlPackages.FileShareDirInstall: update from 0.04 to 0.08 2014-04-08 13:25:03 +02:00
Peter Simons
70e0d0a921 perlPackages.FileShare: update from 0.02 to 0.03 2014-04-08 13:25:02 +02:00
Peter Simons
e297787704 perlPackages.FileChangeNotify: update from 0.23 to 0.24 2014-04-08 13:25:02 +02:00
Peter Simons
19cca58cd4 perlPackages.FatalException: update from 0.05 to 0.0204 2014-04-08 13:25:02 +02:00
Peter Simons
7b13fd4a4e perlPackages.ExtUtilsParseXS: update from 3.22 to 3.24 2014-04-08 13:25:02 +02:00
Peter Simons
3a8fbfda11 perlPackages.ExtUtilsInstallPaths: update from 0.009 to 0.010 2014-04-08 13:25:02 +02:00
Peter Simons
ae520cd465 perlPackages.ExtUtilsHelpers: update from 0.021 to 0.022 2014-04-08 13:25:02 +02:00
Peter Simons
05ff444d56 perlPackages.ExtUtilsDepends: update from 0.304 to 0.306 2014-04-08 13:25:02 +02:00
Peter Simons
d644332491 perlPackages.ExtUtilsCBuilder: update from 0.280212 to 0.280216 2014-04-08 13:25:02 +02:00
Peter Simons
055cf38d58 perlPackages.ExporterLite: update from 0.02 to 0.04 2014-04-08 13:25:02 +02:00
Peter Simons
b602b53964 perlPackages.ExceptionBase: update from 0.25 to 0.2401 2014-04-08 13:25:02 +02:00
Peter Simons
9c90b4faf6 perlPackages.EvalClosure: update from 0.08 to 0.11 2014-04-08 13:25:02 +02:00
Peter Simons
d2187ff378 perlPackages.Error: update from 0.17019 to 0.17022 2014-04-08 13:25:02 +02:00
Peter Simons
0e01506bf6 perlPackages.EmailSimple: update from 2.102 to 2.203 2014-04-08 13:25:01 +02:00
Peter Simons
8e5416e01f perlPackages.EmailMessageID: update from 1.402 to 1.404 2014-04-08 13:25:01 +02:00
Peter Simons
e5e0ba713b perlPackages.EmailAddress: update from 1.897 to 1.901 2014-04-08 13:25:01 +02:00
Peter Simons
293a26e46a perlPackages.EmailAbstract: update from 3.004 to 3.007 2014-04-08 13:25:01 +02:00
Peter Simons
c8e83e4882 perlPackages.DistZillaPluginTestEOL: update from 0.07 to 0.10 2014-04-08 13:25:01 +02:00
Peter Simons
531c1e65c5 perlPackages.DistZillaPluginPodWeaver: update from 3.101642 to 3.102000 2014-04-08 13:25:01 +02:00
Peter Simons
c07739c247 perlPackages.DistZillaPluginBundleTestingMania: update from 0.20 to 0.21 2014-04-08 13:25:01 +02:00
Peter Simons
adbe515602 perlPackages.DistZilla: update from 4.300036 to 4.300039 2014-04-08 13:25:01 +02:00
Peter Simons
b8b23dd843 perlPackages.DigestMD4: update from 1.5 to 1.9 2014-04-08 13:25:01 +02:00
Peter Simons
b053b81d4c perlPackages.DevelStackTraceAsHTML: update from 0.11 to 0.14 2014-04-08 13:25:01 +02:00
Peter Simons
a0a50476c0 perlPackages.DevelStackTrace: update from 1.30 to 1.31 2014-04-08 13:25:01 +02:00
Peter Simons
22e43904c3 perlPackages.DevelHide: update from 0.0008 to 0.0009 2014-04-08 13:25:01 +02:00
Peter Simons
697b169bd4 perlPackages.DevelGlobalDestruction: update from 0.09 to 0.12 2014-04-08 13:25:01 +02:00
Peter Simons
1531d17512 perlPackages.DevelChecklib: update from 0.98 to 1.01 2014-04-08 13:25:01 +02:00
Peter Simons
5aeb9b3c61 perlPackages.DebugShowStuff: update from 1.14 to 1.16 2014-04-08 13:25:00 +02:00
Peter Simons
55ca4f0135 perlPackages.DateTimeSet: update from 0.31 to 0.3400 2014-04-08 13:25:00 +02:00
Peter Simons
de72951544 perlPackages.DateTime: update from 1.07 to 1.08 2014-04-08 13:25:00 +02:00
Peter Simons
ebb5c742d7 perlPackages.DateManip: update from 6.42 to 6.43 2014-04-08 13:25:00 +02:00
Peter Simons
f9e3f4f4af perlPackages.DataVisitor: update from 0.28 to 0.30 2014-04-08 13:25:00 +02:00
Peter Simons
4594bd017b perlPackages.DataSerializer: update from 0.59 to 0.60 2014-04-08 13:25:00 +02:00
Peter Simons
bab9a16e50 perlPackages.version: update from 0.9902 to 0.9908 2014-04-08 13:25:00 +02:00
Peter Simons
c7c65daf32 Merge pull request #2167 from ocharles/remove-aeson-lens
Remove haskellPackages.aesonLens
2014-04-08 12:50:30 +02:00
Peter Simons
d9332659d2 haskell-Elm: require a recent version of binary 2014-04-08 12:48:22 +02:00
Oliver Charles
1e7c38920d Remove haskellPackages.aesonLens
This doesn't build, has no reverse dependencies, and the lens library
itself now provides this functionality.
2014-04-08 11:44:41 +01:00
Rob Vermaas
a4ebaa61e4 Update dd-agent to 4.2.0 2014-04-08 09:27:09 +02:00
Austin Seipp
4dc15c087a musl: version 1.0.0
NB: This currently doesn't add a working musl-wrapper around musl-gcc to
allow it to work properly (musl has its own dynamic linker as well as
libc too which must be accounted for). But at the moment it builds fine,
and I plan on working more on it in the future. So lets get it
integrated and building on Hydra.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-07 10:31:31 -05:00
Peter Simons
a29b90b4c7 haskell-language-javascript: update to version 0.5.12 2014-04-07 17:06:37 +02:00
Austin Seipp
5aa4495cb5 boolector: add version 1.5 and 1.6
There are two versions here because beginning with 1.6.0, Boolector has
a more restrictive, unfree license which disallows commercial use.

As a result, Boolector 1.5 is the default 'boolector' expression.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-07 09:17:05 -05:00
Ricardo M. Correia
807fad571a grsecurity: Update stable and test patches
stable: 3.0-3.2.56-201404012135 -> 3.0-3.2.56-201404062126
test:   3.0-3.13.8-201404011912 -> 3.0-3.13.9-201404062127
2014-04-07 15:31:12 +02:00
Peter Simons
53d7a1c882 haskell-criterion: downgrade to hastache 0.5.1 to fix the build
Closes <https://github.com/NixOS/nixpkgs/pull/2133>.
2014-04-07 11:54:57 +02:00
vi
3d3648f261 Added a derivation for Ozgun's's retry (Haskell.) 2014-04-07 12:15:33 +08:00
Shea Levy
9949d0255e Merge branch 'make-the-kernel-build-repeatable' of git://github.com/alexanderkjeldaas/nixpkgs
Make the kernel build and initrd generation binary repeatable (#2128)
2014-04-06 17:02:16 -04:00
Peter Simons
2a0a12f333 Upgrade hashable to version 1.2.x.
This change in the GHC 7.6.3 profile violates Haskell Platform, but it fixes
many builds that would not succeed otherwise (such as Trifecta). Overriding
hashable locally in an expression is out of question: the package is used
virtually everywhere.
2014-04-06 21:54:45 +02:00
Peter Simons
267a1692f3 haskell-fdo-notify: add version 0.3.1 2014-04-06 21:53:16 +02:00
Austin Seipp
8d3d50191d spiped: version 1.3.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-06 11:07:35 -05:00
Shea Levy
79c9d556e0 Add sproxy-web 2014-04-06 11:10:01 -04:00
Shea Levy
331d234ef6 Add sproxy 2014-04-06 10:54:44 -04:00
Shea Levy
0bab5319cc Merge branch 'pastebinit' of git://github.com/lethalman/nixpkgs
pastebinit: new package
2014-04-06 07:16:46 -04:00
Mathijs Kwik
6249cc729e add haskell-syntactic-1.11 2014-04-06 11:47:47 +02:00
Mathijs Kwik
773ce7aa32 add haskell-tree-view-0.4 2014-04-06 11:47:46 +02:00
Mathijs Kwik
cdc4c7039d add haskell-data-hash-0.2.0.0 2014-04-06 11:47:46 +02:00
Mathijs Kwik
c01cc1a0e4 add haskell-cheapskate-0.1.0.1 (markdown processor) 2014-04-06 11:47:45 +02:00
Luca Bruno
1653c118bd pastebinit: new package
A software that lets you send anything you want directly to a pastebin from the command line

https://launchpad.net/pastebinit
2014-04-06 11:10:24 +02:00
Shea Levy
d35619429a Merge branch 'cache.su' of git://github.com/wkennington/nixpkgs
su: Make the su package a provider of only the su binary

Fixes #1877
2014-04-05 18:49:30 -04:00
Shea Levy
add2fafffb Merge branch 'master.nmap' of git://github.com/wkennington/nixpkgs
nmap: Build the non-graphical version by default
2014-04-05 18:40:18 -04:00
William A. Kennington III
28ab3acb58 su: Make the su package a provider of only the su binary
Additionally, provide su with the base system and remove su from the
util-linux package as it is now provided by shadow.
2014-04-05 16:01:52 -05:00
William A. Kennington III
47f0f34fca nmap: Build the non-graphical version by default 2014-04-05 14:58:49 -05:00
Shea Levy
bd1a95ee60 Remove superfluous newline 2014-04-05 15:01:05 -04:00
Shea Levy
0fda39ee3e Merge branch 'mtpfs' of git://github.com/qknight/nixpkgs
added mtpfs to mount MTP devices via usb using FUSE
2014-04-05 15:00:38 -04:00
Sander van der Burg
dc614aff92 libresample: Add package 2014-04-05 20:54:47 +02:00
Shea Levy
ea9c8d6a13 Merge branch 'rippled' of git://github.com/ehmry/nixpkgs
rippled: initial pkg and module expressions

Had to change the rippled uid.

Conflicts:
	nixos/modules/misc/ids.nix
2014-04-05 14:23:29 -04:00
Jaka Hudoklin
413ebfb246 virt-manager: update to 1.0.1, fix & update dependencies, gtk3 support
- Vte, add gtk3 support, enable introspection, update to 0.35.90
- Spice-gtk, add gtk3 support
- gtk-vnc, add gtk3 support
- Add libvirt-glib (thanks @bjornfor)
- Add usbredir
- qemu, enable usbredir
- spice-gtk, enable usbredir
- virt-manager, update to 1.0.1

[Bjørn:
* Set namePrefix = "" to preserve package name "virt-manager"
  (instead of "python2.7-virt-manager")
* Add dconf to GIO_EXTRA_MODULES to get persistent settings in
  virt-manager. Without it:
  GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.
* Add ${gtk3}/share to XDG_DATA_DIRS to unbreak "Take Screenshot"
  feature (fixes "Settings schema 'org.gtk.Settings.FileChooser' is not installed")
* gtk-vnc: don't pull "pkgs" attrset for optionalString, use stdenv.lib.optionalString instead.
]
2014-04-05 18:37:05 +02:00
Alexander Kjeldaas
f67015cae4 Make initrd and the kernel builds repeatable. 2014-04-05 08:41:06 +02:00
Peter Simons
7b7d06f91e Merge pull request #2123 from jagajaga/haskell_add_pkgs
Haskell add pkgs
2014-04-04 23:52:13 +02:00
Vladimír Čunát
10147beecf Merge branch vcunat@NixOS:p/stdenv (close #1840)
This branch contains a collection of stdenv-changing updates.
There's glibc 2.18 -> .19 bump and many non-intrusive PRs.

The grsecurity branch #1187 got removed at Eelco's request,
see https://github.com/NixOS/nixpkgs/issues/1840#issuecomment-39327023
2014-04-04 21:33:55 +02:00
Domen Kožar
9f96b8e43d Merge pull request #2125 from lethalman/gnome-disk-utility
Gnome disk utility, libpwquality, libdvdread
2014-04-04 19:04:33 +02:00
Bjørn Forsman
d2ca851c04 python-autopep8: new package
autopep8 is a tool that automatically formats Python code to conform to
the PEP 8 style guide.

https://pypi.python.org/pypi/autopep8/
2014-04-04 16:48:10 +02:00
Luca Bruno
13f40aea33 libpwquality: factor out from gnome-control-center 2014-04-04 16:14:59 +02:00
Arseniy Seroka
ece01ad65f vacuum-graphviz: add pkg 2014-04-04 16:35:44 +04:00
Matej Cotman
7df1ce5088 syncthing: new package and nixos module 2014-04-04 10:46:29 +02:00
Oliver Charles
c4339a029e haskellPackages.twitterConduit: New expression
I've had to patch authenticate-oauth to get this working. The patch
comes from a commit that's already in master, so future versions will
have this and it's ok if cabal2nix ends up discarding this information.
2014-04-03 14:25:37 +01:00
Shea Levy
9a396b3840 Merge branch 'haskell-ftphs' of git://github.com/fmap/nixpkgs
Added a derivation for Goerzen's `ftphs`
2014-04-03 05:08:47 -04:00
Evgeny Egorochkin
91dd38ab79 perlPackages.TermReadLineGnu: update from 1.20 to 1.24 2014-04-03 10:42:27 +03:00
Evgeny Egorochkin
dd01251657 perlPackages.TestWarn: update from 0.24 to 0.30 2014-04-03 10:40:05 +03:00
vi
5150da8a5c Added a derivation for Goerzen's ftphs. 2014-04-03 13:41:36 +08:00
Evgeny Egorochkin
8654b6b51c perlPackages.GD: update from 2.50 to 2.53 2014-04-03 07:36:35 +03:00
Evgeny Egorochkin
7973471c7b perlPackages.IOSocketInet6: update from 2.71 to 2.72 2014-04-03 07:03:26 +03:00
Cillian de Róiste
0119561d99 nodePackages: add react.js and update node-packages-generated.nix 2014-04-02 21:07:30 +02:00
Vladimír Čunát
8146737127 Merge #2090: add new lockdep tool from Linux 3.14 2014-04-02 20:55:30 +02:00
Vladimír Čunát
457fdb3842 texinfo: move ncurses support into texinfoInteractive
This, for example, drops the stdenv dependency on ncurses.
2014-04-02 19:05:56 +02:00
Vladimír Čunát
11d4c257c1 Merge branch glibc-2.19, see #1840 2014-04-02 19:03:49 +02:00
Domen Kožar
80a03f665d Merge branch 'x-updates' 2014-04-02 15:30:52 +02:00
Ricardo M. Correia
52d233af22 grsecurity: Update stable patch from 3.0-3.2.55-201403300851 -> 3.0-3.2.56-201404012135 2014-04-02 15:11:33 +02:00
Ricardo M. Correia
407a6857c6 grsecurity: Update stable and test patches
stable: 3.0-3.2.55-201403252026 -> 3.0-3.2.55-201403300851
test:   3.0-3.13.7-201403252047 -> 3.0-3.13.8-201404011912
2014-04-02 02:16:59 +02:00
Domen Kožar
75fb34eb6d add pythonPackages.gunicorn 2014-04-01 13:44:37 +00:00
Vladimír Čunát
6445ac90ad Merge master into x-updates 2014-04-01 10:49:31 +02:00