JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
66,604 Commits 2 Branches 0 Tags 13 GiB
09b4a7cc1b
Commit Graph

1812 Commits

Author SHA1 Message Date
William A. Kennington III
b9a366e5c4 Fix typo 2015-05-29 14:35:23 -07:00
William A. Kennington III
b07929b0a3 Use libpulseaudio instead of pulseaudio 2015-05-29 14:32:56 -07:00
William A. Kennington III
cd52c04456 Fix more ca-bundle paths 2015-05-29 14:26:32 -07:00
William A. Kennington III
14c1e0fa1f Fix ca-bundle paths 2015-05-29 14:03:34 -07:00
Tobias Geerinckx-Rice
158e1cfdd0 Don't use "with licenses;" for single licences 
And don't use square brackets on such lines.
 2015-05-28 19:20:29 +02:00
Vladimír Čunát
fa89e79391 gnome3.anjuta: fix gsettings to be runnable at least 2015-05-28 11:45:46 +02:00
William A. Kennington III
85932bc5a9 krb5: 1.13.1 -> 1.13.2 2015-05-28 02:20:08 -07:00
Vladimír Čunát
29475103be gnome3.anjuta: fix hash 
/cc @lethalman. I've got no idea if the hash has changed upstream or what.
I thought it remained from 3.12 version of anjuta, but that was a
different hash.
 2015-05-28 11:10:08 +02:00
Vladimír Čunát
710df5bb78 Merge master into staging 
It contains some mass-rebuild stuff as well,
so best push the changes to staging, too.
 2015-05-27 20:47:23 +02:00
Siarhei Zirukin
4fd635404d e19: updates for 1.14.0 
- libraries and applications updated to the latest
- the "elementary getting started" (https://docs.enlightenment.org/auto/elementary/group__Start.html)
  works with just `pkg-config --cflags --libs elementary`
- switched from lua-old to elua
 2015-05-27 20:06:06 +02:00
Damien Cassou
c11ccdbc99 Merge pull request #8016 from DamienCassou/fix-seahorse-3.16 
Update seahorse 3.14 -> 3.16
 2015-05-27 14:55:30 +02:00
Damien Cassou
0c44867bf2 Update seahorse 3.14 -> 3.16 2015-05-27 14:07:34 +02:00
Vladimír Čunát
6f67b91db3 xfce: maint. updates of exo, thunar, xfdesktop, xfwm4 2015-05-26 20:47:54 +02:00
Luca Bruno
4053dcdace mutter: fix failure on i686 2015-05-26 10:57:01 +02:00
Vladimír Čunát
2e9bc4aee3 goffice: update 
Some update(s) were lost during GNOME-3.12 drop 25f9555599.
I hope there weren't much else lost.

@lethalman: do you think it's good to have goffice inside gnome3?
Nothing from inside refers to it, and it doesn't seem to be follow
gnome's release cycle. In fact it rather seems tied to gnumeric instead.
 2015-05-24 19:53:34 +02:00
Gabriel Ebner
064623599f Remove reference to missing autogen.sh. 2015-05-21 20:37:40 +02:00
Luca Bruno
22f957dad2 Drop gnome_icon_theme* from gnome3 2015-05-19 14:45:00 +02:00
Luca Bruno
99b14de505 Fix evaluation of goffice 0.8 across gnome updates 2015-05-18 13:05:26 +02:00
Luca Bruno
81c115ba99 termite: update and use vte 0.40 2015-05-18 12:31:29 +02:00
Luca Bruno
25f9555599 Drop GNOME 3.12 2015-05-18 12:24:08 +02:00
Vladimír Čunát
3b913df217 gnome3_16.gexiv2: maintenance update and fix hash 
/cc @lethalman.
 2015-05-17 10:26:33 +02:00
Luca Bruno
fc44525137 gdl: add myself as maintainer 2015-05-16 12:23:49 +02:00
Luca Bruno
bbc40015b6 gdl 3.16: fix sha 2015-05-16 12:22:47 +02:00
Thomas Tuegel
aa5791f7ad kde4.kopete: fix build 2015-05-07 21:49:54 -05:00
Luca Bruno
3715dbbb98 gnome-contacts: use automake 1.14 2015-05-07 14:28:14 +02:00
Thomas Tuegel
6dfbbc8e24 plasma53: fix kcm_keyboard 2015-05-06 07:08:20 -05:00
Domen Kožar
dfd4ada456 kde4: fix cantor build 2015-05-05 13:05:54 +02:00
Domen Kožar
ee0ecb520e gnome3.gdm: remove a patch since X supports access control now 2015-05-05 12:40:21 +02:00
Domen Kožar
3a080a2d89 gnome3_16.geary: add missing params (gcr is still not picked up 2015-05-05 12:18:14 +02:00
Domen Kožar
befacbba0d gnome3.tracker: pass correct automake 2015-05-05 11:50:58 +02:00
Thomas Tuegel
2325791c2b plasma53: patch upstream startkde 
Rather than shipping our own startkde script, we will go back to
patching upstream's script. This will be less confusing to potential
contributors.
 2015-05-03 17:09:50 -05:00
Luca Bruno
8882805b07 Add vte 2.90 to gnome 3.16 in case anybody still wants it 2015-05-02 14:53:37 +02:00
koral
e52afb24da gconf: removed heavy dependency on gtk by default. 2015-05-02 07:37:50 +00:00
William A. Kennington III
00df204c82 Merge remote-tracking branch 'upstream/master' into staging 2015-05-01 15:57:09 -07:00
Joachim Fasting
bf7ad2d84f meta.description fixups 
Mostly scripted substitutions with a couple of subjective enhancements.
 2015-04-30 18:17:42 +02:00
Thomas Tuegel
690b3ffa64 remove plasma-5.2.2 2015-04-28 11:10:25 -05:00
Thomas Tuegel
43f67f265e plasma53: update to final release 2015-04-28 11:10:25 -05:00
Thomas Tuegel
674c128cc0 plasma53: fix build failures 2015-04-28 11:10:24 -05:00
Thomas Tuegel
83e4dfcf2f plasma53: fix source URLs 2015-04-28 11:10:24 -05:00
Herwig Hochleitner
19a62322ea gnome3.16: dconf-editor is now a separate package 2015-04-28 02:54:14 +02:00
Herwig Hochleitner
c600f5af25 gnome3: move definition of package sets into pkgs 2015-04-28 02:54:14 +02:00
Luca Bruno
db3b86560f GNOME 3.16.1, closes #7357 2015-04-25 12:02:33 +02:00
Thomas Tuegel
cefdbbcfb8 add plasma-5.2.95 2015-04-19 20:50:03 -05:00
Vladimír Čunát
7f30d090b2 xfce: maintenance updates of various core pkgs 2015-04-18 07:11:55 +02:00
Thomas Tuegel
d1a6edae0d kde-frameworks: update 5.8 to 5.9 2015-04-11 18:31:00 -05:00
Thomas Tuegel
88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Aycan iRiCAN
cfe4169589 e19/rage: fixed sha 2015-04-09 18:40:07 +03:00
Aycan iRiCAN
59b4ab6e83 e19: updated efl elementary evas and rage 2015-04-09 18:24:41 +03:00
Ambroz Bizjak
6e3642b89e Plasma 5.2.2: Fix startkde due to qdbus and qtpaths moving to qt5.base in Qt5.4. 2015-04-07 11:26:49 -05:00
Ambroz Bizjak
bd368b7530 Plasma 5.2.2: Update source package for muon. 
The original 5.2.2 version has been replaced with 5.2.2-1.
 2015-04-07 11:26:48 -05:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
Ryan Mulligan
93f1029b0f Get rid of fetchurlGnome 
closes #1707
 2015-04-04 22:22:12 -07:00
Domen Kožar
6e59d43725 gnome3.tracker: fix poppler/glib dependency 2015-04-03 17:38:55 +02:00
Domen Kožar
7cc31b6b49 fix eval 2015-04-02 22:30:28 +02:00
Thomas Tuegel
c0d5cd0ff9 poppler: fix build of Qt 4 and Qt 5 wrappers 
The autoconf build system for poppler does not support building the
wrappers separately, so this slightly enlarges the size of closures. To
compensate, the command-line utilities have been separated into their
own package.
 2015-04-02 09:51:44 -05:00
Arseniy Seroka
d32e1215b6 Merge pull request #7111 from spwhitt/libcroco 
libcroco: Enable building on Darwin
 2015-04-01 00:34:07 +03:00
Nikolay Amiantov
dda963caf1 gtksourceview: propagate gtk3 2015-03-31 22:04:43 +02:00
Spencer Whitt
7a0fae2162 libcroco: Enable building on Darwin 2015-03-31 12:37:26 -04:00
Karn Kallio
3661c7a842 kde-4.14 smokegen: prevent cmake from removing rpath on install 
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-03-30 13:37:16 +02:00
William A. Kennington III
fa2e5b25ba Merge branch 'master' into staging 2015-03-29 14:25:48 -07:00
Karn Kallio
b09a6573a0 indilib version advance; older sources no longer available 2015-03-29 15:29:01 -05:00
Karn Kallio
52a6c8496b complete removal of obsolete kdelibs derivation 2015-03-28 17:20:25 -05:00
Thomas Tuegel
77fb55d1f0 plasma52: update to plasma-5.2.2 2015-03-24 17:16:02 -05:00
Thomas Tuegel
5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Kirill Elagin
370e40aef5 startkde: Fix kdostartupconfig5 path 2015-03-21 18:56:59 -05:00
Kirill Elagin
29808a11b6 startkde: Qt 5.4 is here 2015-03-21 18:56:49 -05:00
Thomas Tuegel
c918f57ebb kde4: remove obsolete kdelibs derivation 2015-03-21 18:54:29 -05:00
Thomas Tuegel
2c4c712a70 kde4: use kdelibs from kdeApps_stable 
Upstream is releasing bugfixes to kdelibs only through KDE Applications
releases, so this is the correct way to get updates until we discontinue
KDE 4. This also ensures that kdeApps and kde4 are using the same
version of kdelibs; different versions appear to be causing integration issues.
 2015-03-21 18:46:54 -05:00
Gabriel Ebner
9a971364ac Patch gnome-control-center not to override VPN plugin paths. 
The network-manager vpn plugin configuration files contain the correct
absolute paths to the plugin libraries in the store; however upstream
(unsuccessfully) tries to find them in a predefined path.
 2015-03-16 13:21:23 +01:00
Vladimír Čunát
208d1f24db xfce: more update fallout 
- forgotten mousepad update, including some wrapping magic
- dealing with panel plugins (either fix or mark as broken)
	CC maintainer @AndersonTorres.
- remove some libxfcegui4 occurrences, as it's being phased out
- minor stuff
 2015-03-12 23:02:15 +01:00
Domen Kožar
9567ba4601 xfce: 4.10 -> 4.12 (close #6610) 2015-03-12 23:02:15 +01:00
Luca Bruno
aae9e49cbc Add setup-hook to hicolor_icon_theme 2015-03-09 15:55:24 +01:00
Vladimír Čunát
0619c852cb automake: use 1.14.* as the default 
I see 1.15 has been released recently,
but that's probably too new to be the default.
 2015-03-09 15:55:21 +01:00
Thomas Strobel
f431f73964 Update: Enlightenment + EFL 
EFL: 1.12.3 -> 1.13.1
Enlightenment: 1.19.3 -> 1.19.4
 2015-03-03 11:29:12 +01:00
Marius Bakke
aff4066293 terminology: update to 0.8.0 2015-02-27 14:36:54 +00:00
Thomas Tuegel
c6ead8477d plasma52: update to 5.2.1 2015-02-24 20:22:45 -06:00
Thomas Tuegel
8cf78bf5f4 update various packages to use Qt 5.4 2015-02-21 11:39:20 -06:00
Thomas Tuegel
69ff7ab541 remove plasma-5.1 2015-02-21 11:39:18 -06:00
Vladimír Čunát
54b4e92574 kwin-5.2: fix build by upstream patch 
CC: @ttuegel.
 2015-02-14 14:18:11 +01:00
Luca Bruno
f7b26bf98f gnome3: Set XCURSOR_PATH. Closes #6191 2015-02-11 11:48:51 +00:00
Thomas Strobel
7f9eaf0eff e19: updates (close #6003) 
EFL: 1.12.2 -> 1.12.3
Enlightenment: 0.19.2 -> 0.19.3
 2015-02-04 22:20:31 +01:00
Shea Levy
c45372f038 Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae' 
Partial staging merge, including cc-wrapper fixes

Conflicts:
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-02-02 21:14:28 -05:00
Thomas Tuegel
aa308252ac kf56, plasma52: use ordinary stdenv 2015-01-28 08:40:27 -06:00
Thomas Tuegel
a47cfb4ac6 add plasma-5.2 2015-01-27 22:16:31 -06:00
Thomas Tuegel
c6f1c75472 kdeApps: update to 14.12.1 2015-01-26 21:01:06 -06:00
Thomas Tuegel
726b80bc87 startkde: don't split script between NixOS module and package 2015-01-26 21:01:06 -06:00
Thomas Tuegel
95d23beb8d startkde: explain presence of entire script 2015-01-26 21:01:05 -06:00
Thomas Tuegel
5a52ddb243 kf5, plasma5, kdeApps: add documentation for maintainers 2015-01-26 21:00:39 -06:00
Thomas Tuegel
62bfe75d42 add plasma-5.1.2 2015-01-26 20:59:52 -06:00
Peter Simons
ec6b82a0c2 Merge branch 'master' into staging. 2015-01-19 18:41:17 +01:00
Domen Kožar
0ff4b2e040 Merge pull request #5816 from AndersonTorres/xfce 
Adding some plugins to XFCE4
 2015-01-18 10:32:32 +01:00
Evgeny Egorochkin
e92c942d1d KDE4: correctly propagate user env packages 2015-01-18 08:10:25 +02:00
Evgeny Egorochkin
5c496422e6 kde4: fix silent missing kde-workspace dependencies needed for kfontinst and kfontview 2015-01-18 07:13:53 +02:00
AndersonTorres
5d853f7dca Adding some plugins to XFCE4 
Here is a list:
Battery      (1.0.5)
Clipman      (1.2.6)
Cpufreq      (1.0.0)
Cpugraph     (1.0.5)
Datetime     (0.6.2)
Dict         (0.3.0)
Embed        (1.4.1)
Eyes         (4.4.3)
Fsguard      (1.0.1)
Genmon       (3.4.0)
Netload      (1.2.4)
Notes        (1.7.7)
Systemload   (1.1.2)
Verve        (1.0.0)
Xkb          (0.5.6)
 2015-01-17 21:53:23 -02:00
Eric Seidel
88eae46455 rename occurrences of gcc.gcc to gcc.cc 2015-01-14 20:47:49 -08:00
Matej Cotman
d4635ce968 rage: fix video for gstreamer engine 2015-01-13 14:59:53 +01:00
Matej Cotman
d9e7464edf enlightenment: import dialog fix 2015-01-10 04:20:57 +01:00
Luca Bruno
ff6f1555b1 gnome-shell: add missing sqlite needed by libcamel 2015-01-08 12:34:12 +01:00
Luca Bruno
54897da6dc gnome-control-center: fix kerberos -> krb5 2015-01-08 12:34:11 +01:00
Luca Bruno
97b4154762 evolution: fix missing sqlite dependency due to libcamel 2015-01-08 12:34:11 +01:00
Luca Bruno
412819cbcb yelp: fix build missing sqlite dependency 2015-01-08 11:03:31 +01:00
Luca Bruno
8a6d0fdea1 geary: fix build missing sqlite dependency 2015-01-08 11:00:42 +01:00
Luca Bruno
13e3a723f9 evolution-data-server: fix build missing sqlite dependency 2015-01-08 10:50:28 +01:00
William A. Kennington III
afeef240dc kerberos: Use default kerberos instead of krb5 2014-12-30 00:05:12 -08:00
Vladimír Čunát
40397be737 e19: enableParallelBuilding of some larger components 
Some parts build too long, it seems to me, so I sped them up.
 2014-12-28 11:40:01 +01:00
Matej Cotman
812e2734a5 efl: fix build 2014-12-28 06:09:59 +01:00
Vladimír Čunát
3c050d00a5 upower: use newer version by default 
Tested on KDE4, fixed with xfce, and was used with GNOME before.
CC @lethalman.

I did not test e19, as it won't build, probably due to #5392 @shlevy.
CC maintainer @matejc.

Also removed a forgotten unused patch.
 2014-12-27 22:46:46 +01:00
Vladimír Čunát
ca80e416dd xfce4-session: support newer upower by an Arch patch 
Tested.
 2014-12-27 22:46:46 +01:00
Vladimír Čunát
600534513c xfce4-task-manager: update (features and bugfixes) 2014-12-25 11:30:04 +01:00
Evgeny Egorochkin
b6e68d24ea KDE4: update 4.14.1 to 4.14.3 2014-12-24 03:40:20 +02:00
Vincent Laporte
81a2b58c39 nixpkgs: remove redundant attribute sip 
Because:

 1. It is a mere alias of `pythonPackages.sip`
 2. It is usually not needed since propagated by `pyqt4`
 3. It makes it easy to have a packages depend on two different versions
 of sip
 2014-12-23 19:37:21 +01:00
Thomas Strobel
5c620a998d Update: Enlightenment: 0.19.1 -> 0.19.2 2014-12-22 10:04:15 +01:00
Matej Cotman
6616979638 rage: add enlightenment's own video/audio player 2014-12-19 15:52:21 +01:00
Matej Cotman
dbe7fe2735 e19: fix - not showing keyboard layouts - issue 2014-12-17 15:44:59 +01:00
Matej Cotman
c1bf0837a1 e19: update enlightenment core libraries 2014-12-17 15:44:32 +01:00
Eelco Dolstra
0e8373143e kdepimlibs: Get rid of a dependency on boost.dev 2014-12-15 17:54:06 +01:00
Luca Bruno
e3b84d8dfc Some fixes to the polari irc client 2014-12-12 15:24:23 +01:00
Damien Cassou
bc789064d8 Package for the Polari IRC app 
This commit includes a patch to telepathy's derivation, written by
Lethalman. This patch makes public the Telepathy's dependency to
dbus_glib. This patch will become problematic with the next pkgconfig
upgrade but this upgrade should make the patch irrelevant. See these 2
links for more information:
- https://bugs.freedesktop.org/show_bug.cgi?id=15199
- https://bugzilla.redhat.com/show_bug.cgi?id=436773

Modified by Luca Bruno:
- Moved telepathy_idle to propagatedUserEnvPkgs
- Added myself to maintainers
- Enable parallel building
 2014-12-12 15:12:19 +01:00
Vladimír Čunát
15b9626a3d kde: fix CVE-2014-8600 by upstream patches 
https://www.kde.org/info/security/advisory-20141113-1.txt
I couldn't find kio-extras, so I hope we don't have it disguised somewhere.
 2014-12-10 19:38:50 +01:00
Domen Kožar
abae51655d xfdesktop: 4.10.2 -> 4.10.3 2014-12-09 11:29:16 +01:00
Domen Kožar
4e611fb21a xfce4.xfce4-power-manager: 1.3.0 -> 1.3.2 2014-12-09 11:29:15 +01:00
Luca Bruno
5a999ca446 tracker, gnome-music: drop LD_LIBRARY_PATH 2014-12-08 20:27:22 +01:00
Domen Kožar
4aa3eec330 Merge branch 'master' into staging 
Conflicts:
	pkgs/development/libraries/fontconfig/default.nix
 2014-12-07 14:02:48 +01:00
Bjørn Forsman
289ec3b5aa html-tidy: align attrname with pkgname 
htmlTidy => html-tidy. Keep copy of old attribute for backward
compatibility.
 2014-12-06 17:01:05 +01:00
Evgeny Egorochkin
4672aadce2 KDE4: fix kdepim build 2014-12-04 10:22:27 +02:00
Jos van den Oever
f12e2d1e66 Update gnumeric 
goffice is also updated. goffice is maintained by the gnumeric people
and released in sync with gnumeric. gnumeric 1.12.x corresponds to
goffice 0.10.x.
 2014-12-03 09:12:39 +01:00
William A. Kennington III
5825d82e5f boost: Pin packages to 1.56 2014-11-30 05:31:02 -08:00
Vladimír Čunát
cbd2305d4d Merge branch 'master' into staging 2014-11-28 18:59:07 +01:00
Vladimír Čunát
b5ff06eda4 Merge branch 'master' into staging 2014-11-26 21:48:26 +01:00
Matej Cotman
084fb3a0d3 e18: remove old desktop manager 2014-11-26 21:44:23 +01:00
Matej Cotman
959946a5af e17: remove old desktop manager 2014-11-26 21:44:23 +01:00
Vladimír Čunát
b4aba8c577 evince-3.12: maintenance update 2014-11-25 00:05:12 +01:00
Vladimír Čunát
a9bad25ffe Merge branch 'master' into staging 2014-11-24 22:14:25 +01:00
aszlig
764f428ede
libgnomecups: Add CUPS >= 1.6 compatibility patch. 
Patch is from Gentoo at:

http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch

Fixes the following Hydra build failure:

http://hydra.cryp.to/build/250133/nixlog/5/raw

Thanks to @peti for the notification.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
 2014-11-23 18:20:09 +01:00
Thomas Tuegel
dfaa39db41 polkit-qt-1: Qt 5 support 
polkit-qt-1 is upgraded to the latest version, which supports Qt 5. The
attributes are also renamed to differentiate the Qt 4 and Qt 5
branches. The prior naming scheme differentiated between polkit-qt-1 and
polkit-qt, but we no longer package the latter.
 2014-11-20 11:10:39 -06:00
Mateusz Kowalczyk
d3568f277c e17.terminology: update from 0.5.1 to 0.7.0 2014-11-17 18:11:03 +00:00
Mateusz Kowalczyk
9b14ab9f6a e17.eina: update from 1.7.5 to 1.7.10 2014-11-17 18:10:49 +00:00
Luca Bruno
0a34445d74 Document the fact that GNOME 3.12 must use clutter 1.18 2014-11-17 15:15:19 +01:00
Luca Bruno
24ad1612b4 Revert "clutter: update 1.18 -> 1.20. Shouldn't break anything" 
This reverts commit 5e14c86b80.

Overlooked an experimental API that breaks mutter in GNOME 3.12.
 2014-11-17 15:10:56 +01:00
Luca Bruno
5e14c86b80 clutter: update 1.18 -> 1.20. Shouldn't break anything 2014-11-17 15:05:50 +01:00
Luca Bruno
e8adc8b5ec Drop GNOME 3.10 2014-11-14 22:46:37 +01:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging 
Conflicts:
	pkgs/development/libraries/boost/generic.nix
 2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Nikolay Amiantov
aeaa96f7e4 xfce4-volumed: add package (close #4628) 2014-11-08 21:48:51 +01:00
Vladimír Čunát
52404a868d Merge recent master into staging 
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
 2014-11-05 15:00:44 +01:00
Mateusz Kowalczyk
cd2cd41c96 ristretto: wrap icon theme 2014-11-03 20:02:41 +00:00
Peter Simons
a9c53037fa Merge remote-tracking branch 'origin/master' into staging. 2014-11-02 16:15:53 +01:00
cillianderoiste
919ed14477 Merge pull request #4627 from abbradar/xfce-mixer 
xfce4-mixer: add pulseaudio support
 2014-10-31 15:08:42 +01:00
Peter Simons
b11060d8db Merge remote-tracking branch 'origin/master' into staging. 2014-10-31 11:14:24 +01:00