JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
82,766 Commits 2 Branches 0 Tags 12 GiB
8729bd8bb9
Commit Graph

71756 Commits

Author SHA1 Message Date
taku0
725c85c720 lp_solve: fixed build error due to defining isnan 2016-05-04 19:58:05 +09:00
Kosyrev Serge
0438192122 ghc8 | config: turtle: jailbreak 2016-05-04 13:31:28 +03:00
Kosyrev Serge
2e72002012 ghc8 | config: trifecta: jailbreak 2016-05-04 13:31:28 +03:00
Kosyrev Serge
c9553d7b6d ghc8 | config: th-reify-many -> 0.1.4.1 2016-05-04 13:31:28 +03:00
Kosyrev Serge
81f12377e4 ghc8 | config: th-desugar -> git 2016-05-04 13:31:28 +03:00
Kosyrev Serge
c03af86d39 ghc8 | config: stm-conduit -> git 2016-05-04 13:31:28 +03:00
Kosyrev Serge
49a9213760 ghc8 | config: singletons -> git 2016-05-04 13:31:28 +03:00
Kosyrev Serge
6ce39b317e ghc8 | config: servant*: jailbreak, disable tests 2016-05-04 13:28:26 +03:00
Kosyrev Serge
d27186a9ca ghc8 | config: sdl2: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
5e08a820dc ghc8 | config: reducers: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
1fa1be62b6 ghc8 | config: pointed -> pointed_5 2016-05-04 13:28:26 +03:00
Kosyrev Serge
4015f60d1d ghc8 | config: parsers: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
2018121298 ghc8 | config: monads-tf: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
62db240617 ghc8 | config: lucid-svg: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
944b28f7c5 ghc8 | config: linear -> git, unreleased fixes 2016-05-04 13:28:26 +03:00
Kosyrev Serge
38f9a1abdf ghc8 | config: force-layout: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
82b4224835 ghc8 | config: foldl: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
4d2b957b8b ghc8 | config: diagrams: jailbreak (doesn't make them build, issue filed) 2016-05-04 13:28:26 +03:00
Kosyrev Serge
6d18c05551 ghc8 | config: authenticate-oauth: jailbreak 2016-05-04 13:28:26 +03:00
Kosyrev Serge
1c88b276c3 ghc8 | config: active: jailbreak 2016-05-04 13:28:26 +03:00
zimbatm
5901a8c63b autojump: include a way to find the share dir 
autojump-share is a new script that gives you the path to autojump's
shared directory. It can then be used in the various shell's rc files to
find and source the autojump integration. Eg:

    source "$(autojump-share)/autojump.bash"

Fixes #3239
 2016-05-04 11:08:41 +01:00
José Romildo Malaquias
0bdb8ef7f3 enlightenment: 0.20.6 -> 0.20.7 2016-05-04 06:31:23 -03:00
zimbatm
007ea84222 Merge pull request #15181 from bradediger/ruby-2.3.1 
ruby: update 2.3 series to 2.3.1
 2016-05-04 10:31:08 +01:00
taku0
8c02de135f amarok: add pcre as a dependency to fix failing build 2016-05-04 16:06:43 +09:00
Brandon Kase
17d85f4e91 vimPlugins: add missing haskell plugins 
* haskell-vim
* hlint-refactor-vim
* vim-haskellConcealPlus
 2016-05-03 23:12:16 -07:00
taku0
90f5be3133 firefox-bin: 45.0.2 -> 46.0.1 2016-05-04 14:50:17 +09:00
Joachim Fasting
eecd06409f Merge pull request #15205 from romildo/upd.imlib2 
imlib2: 1.4.8 -> 1.4.9
 2016-05-04 06:46:26 +02:00
Joachim Fasting
da767356f2
grsecurity: support disabling TCP simultaneous connect 
Defaults to OFF because disabling TCP simultaneous connect breaks some
legitimate use cases, notably WebRTC [1], but it's nice to provide the
option for deployments where those features are unneeded anyway.

This is an alternative to https://github.com/NixOS/nixpkgs/pull/4937

[1]: http://article.gmane.org/gmane.linux.documentation/9425
 2016-05-04 03:53:24 +02:00
José Romildo Malaquias
3e401a8d01 imlib2: 1.4.8 -> 1.4.9 2016-05-03 22:34:47 -03:00
Svein Ove Aas
c5451206ab Init CKAN: The Comprehensive Kerbal Archive Network (#15202) 
* ckan: Init at 1.16.1
 2016-05-04 02:12:39 +01:00
Joachim Fasting
d0306e4ab4 Merge pull request #15201 from romildo/fix.xfce4-whiskermenu-plugin 
xfce4-whiskermenu-plugin: 1.5.2 -> 1.5.3
 2016-05-04 02:29:20 +02:00
Thomas Tuegel
d9f57d5256 Merge pull request #15203 from NixOS/update-poppler 
poppler: 0.36.0 -> 0.43.0
 2016-05-03 18:29:24 -05:00
Franz Pletz
2acea21155 gitlab: 8.5.7 -> 8.5.12 2016-05-04 01:24:55 +02:00
Franz Pletz
69c14985d0 imagemagick: Disable insecure coders (ImageTragick) 
See:

  * https://imagetragick.com/
  * https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
 2016-05-04 01:22:02 +02:00
Franz Pletz
05eae0242d imagemagick: 6.9.3-8 -> 6.9.3-9 2016-05-04 01:22:02 +02:00
Joachim Fasting
0bd31bce10
grsecurity: drop support for 4.4 kernels 
From now on, only the testing branch of grsecurity will be supported.
Additionally, use only patches from upstream.

It's impossible to provide meaningful support for grsecurity stable.
First, because building and testing \(m \times n \times z) [1], packages
is infeasible.  Second, because stable patches are only available from
upstream for-pay, making us reliant on third-parties for patches. In
addition to creating yet more work for the maintainers, using stable
patches provided by a third-party goes against the wishes of upstream.

nixpkgs provides the tools necessary to build grsecurity kernels for any
version the user chooses, however, provided they pay for, or otherwise
acquire, the patch themselves.

Eventually, we'll want to remove the now obsolete top-level attributes,
but leave them in for now to smoothe migration (they have been removed
from top-level/release.nix, though, because it makes no sense to have
them there).

[1]: where \(m\) is the number of grsecurity flavors, \(n\) is the
number of kernel versions, and z is the size of the `linuxPackages` set
 2016-05-04 01:07:53 +02:00
Tobias Geerinckx-Rice
63a63c53d6
poppler: 0.36.0 -> 0.43.0 2016-05-04 00:40:03 +02:00
Tobias Geerinckx-Rice
d6e4c1b750
thinkfan: install manual, README and examples 
READMEs usually just waste those precious kilobytes, but both the
manual page and --help output refer to this one quite a bit.
 2016-05-04 00:39:51 +02:00
José Romildo Malaquias
41b5de4773 xfce4-whiskermenu-plugin: 1.5.2 -> 1.5.3 2016-05-03 19:13:09 -03:00
obadz
b1bf11881a spdlog: init at 292bdc5 2016-05-03 23:05:37 +01:00
José Romildo Malaquias
518b9abfd5 xfce4-whiskermenu-plugin: the xfce4-panel binary is in ${xfce4panel.out} 2016-05-03 19:03:46 -03:00
Tobias Geerinckx-Rice
db3ee01ab6
geolite-legacy: 2016-05-02 -> 2016-05-03 2016-05-03 23:42:08 +02:00
Arseniy Seroka
82475a9a7c Merge pull request #15175 from magnetophon/linuxband 
linuxband: init at 12.02.1
 2016-05-03 22:58:43 +03:00
Arseniy Seroka
f3eca5f5d2 Merge pull request #15196 from groxxda/bump/connman 
connman: 1.31 -> 1.32
 2016-05-03 22:58:20 +03:00
Arseniy Seroka
c9fb51451a Merge pull request #15197 from romildo/upd.gtk-xfce-engine 
gtk-xfce-engine: 2.10.1 -> 3.2.0
 2016-05-03 22:58:02 +03:00
Tobias Geerinckx-Rice
31253ad957
cdrtools: 3.02a03 -> 3.02a06 2016-05-03 20:41:19 +02:00
Tobias Geerinckx-Rice
d4d6d9d3d2
ortp: 0.24.2 -> 0.25.0 2016-05-03 20:41:19 +02:00
Tobias Geerinckx-Rice
ff6a98612c
seccure: 0.4 -> 0.5 2016-05-03 20:41:19 +02:00
Thomas Tuegel
147d942b54 julia: remove ttuegel from maintainers 
ttuegel has not used julia in some time
 2016-05-03 13:34:50 -05:00
Alexander Ried
82c141b999 Revert "iptables: add 1.6 branch (init 1.6.0). Not making it the default this time." 
This reverts commit 74f7916a9a.

Time to make it the default.
 2016-05-03 20:29:52 +02:00
Michael Raskin
0bc13e3af2 iptables: 1.4.21 -> 1.6.0 2016-05-03 20:29:30 +02:00
Tuomas Tynkkynen
980bca286e gcc 4.5, 4.6: Remove broken update-gcc.sh symlinks 2016-05-03 21:29:16 +03:00
José Romildo Malaquias
f0da9ff412 gtk-xfce-engine: add support to Gtk3 2016-05-03 15:18:23 -03:00
José Romildo Malaquias
f72a2faa28 gtk-xfce-engine: 2.10.1 -> 3.2.0 2016-05-03 15:14:50 -03:00
Alexander Ried
d74335da85 connman: make dependency on awk explicit 2016-05-03 20:10:58 +02:00
Alexander Ried
b95eebec65 connman: 1.31 -> 1.32 
fetch release tarball instead of git checkout and drop autotools

This update is compatible with iptables 1.6.0 (see #12178)
 2016-05-03 20:10:54 +02:00
Tobias Geerinckx-Rice
959472a824
nginx: 1.8.1 -> 1.10.0 
Changes: http://nginx.org/en/CHANGES-1.10
 2016-05-03 20:05:57 +02:00
Alexander Ried
a0a6a3df88 libcap: Move old libcap_* aliases to aliases.nix 2016-05-03 19:52:53 +02:00
Alexander Ried
5c295a4925 libcap: Replace occurences of libcap_progs with libcap.out 2016-05-03 19:52:53 +02:00
Alexander Ried
7382afac40 libcap: replace old split with multi-output 2016-05-03 19:52:10 +02:00
Alexander Ried
64ef643833 libcap: 2.24 -> 2.25 2016-05-03 19:52:10 +02:00
Alexander Ried
3fe746cfc2 tinc_pre: 1.1pre-git2016.01.28 -> 1.1pre-14 (#15192) 
split the documentation output
remove the tinc-gui binary because python dependencies are not fulfilled
 2016-05-03 19:39:53 +02:00
Tobias Geerinckx-Rice
bf81306848
gandi-cli: pull out of python-packages.nix 2016-05-03 18:28:23 +02:00
Franz Pletz
6d55b2e9c0 libressl: 2.2.6 -> 2.2.7, 2.3.3 -> 2.3.4 
Fix multiple vulnerabilities in libcrypto relating to ASN.1 and encoding.

http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.2.7-relnotes.txt
http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.4-relnotes.txt
 2016-05-03 17:22:35 +02:00
Nathan Zadoks
bdafc6df04 openssl: 1.0.1s -> 1.0.1t, 1.0.2g -> 1.0.2h 
CVE-2016-2108, high severity: Memory corruption in the ASN.1 encoder
CVE-2016-2107, high severity: Padding oracle in AES-NI CBC MAC check
CVE-2016-2105, low severity: EVP_EncodeUpdate overflow
CVE-2016-2106, low severity: EVP_EncryptUpdate overflow
CVE-2016-2109, low severity: ASN.1 BIO excessive memory allocation
CVE-2016-2176, low severity: EBCDIC overread
 2016-05-03 10:54:15 -04:00
Sebastian Gniazdowski
7c0063bf15 zsh-navigation-tools: 1.4 -> 2.0.7 2016-05-03 14:46:43 +00:00
Franz Pletz
5ca8694095 debootstrap: 1.0.68 -> 1.0.80 2016-05-03 16:15:20 +02:00
Franz Pletz
4825d4033e ddrescue: 1.20 -> 1.21 2016-05-03 16:15:20 +02:00
Franz Pletz
b5fdb8585b di: 4.36 -> 4.37 2016-05-03 16:15:20 +02:00
Franz Pletz
9da6390bae ethtool: 4.0 -> 4.5 2016-05-03 16:15:20 +02:00
Franz Pletz
b8aaa3f130 fping: 3.10 -> 3.13 2016-05-03 16:15:20 +02:00
Franz Pletz
d5dd5e05f1 glxinfo: 8.1.0 -> 8.3.0 2016-05-03 16:15:20 +02:00
Franz Pletz
d1998b93d7 lftp: 4.6.4 -> 4.7.1 2016-05-03 16:15:20 +02:00
Franz Pletz
1ec3e71971 libdvdread: 5.0.2 -> 5.0.3 2016-05-03 16:15:20 +02:00
Franz Pletz
18964796e6 mc: 4.8.12 -> 4.8.16 2016-05-03 16:15:20 +02:00
Franz Pletz
d7338bf9d7 msmtp: 1.6.2 -> 1.6.4 2016-05-03 16:15:20 +02:00
Franz Pletz
dd3c18fe22 openh264: 1.4.0 -> 1.5.0 2016-05-03 16:15:20 +02:00
Franz Pletz
b701ea82e7 netperf: 2.6.0 -> 2.7.0 2016-05-03 16:15:20 +02:00
Franz Pletz
50884acd84 lzip: 1.16 -> 1.17 2016-05-03 16:15:20 +02:00
Franz Pletz
dc576f9403 libxmp: 4.3.11 -> 4.3.12 2016-05-03 16:15:20 +02:00
Franz Pletz
57b5c22feb libsecret: 0.18 -> 0.18.5 2016-05-03 16:15:20 +02:00
Franz Pletz
7386619538 libseccomp: 2.2.3 -> 2.3.0 2016-05-03 16:15:20 +02:00
Franz Pletz
c3df9b0650 libnl: 3.2.26 -> 3.2.27 2016-05-03 16:15:20 +02:00
Franz Pletz
9f99116772 libnatspec: 0.2.6 -> 0.3.0 2016-05-03 16:15:20 +02:00
Franz Pletz
b4a5bb3d4b libev: 4.20 -> 4.22 2016-05-03 16:15:20 +02:00
Franz Pletz
7ac522ad83 libevdev: 1.4.5 -> 1.4.6 2016-05-03 16:15:20 +02:00
Franz Pletz
0ab30ecf06 libopus: 1.1 -> 1.1.2 2016-05-03 16:15:20 +02:00
Franz Pletz
117920233f flashrom: 0.9.7 -> 0.9.9 2016-05-03 16:15:20 +02:00
Franz Pletz
669cd2adbf lighttpd: 1.4.37 -> 1.4.39 2016-05-03 16:15:20 +02:00
Franz Pletz
13b9d32917 libu2f-host: 1.0.0 -> 1.1.1 2016-05-03 16:15:20 +02:00
Franz Pletz
bc233fa54e arandr: 0.1.8 -> 0.1.9 2016-05-03 16:15:20 +02:00
Franz Pletz
ed64199876 libdwg: 0.3 -> 0.6 2016-05-03 16:15:20 +02:00
Franz Pletz
47a7b42d51 collectd: 5.5.0 -> 5.5.1 2016-05-03 16:15:20 +02:00
Franz Pletz
d8230abeed libass: 0.12.2 -> 0.13.2 2016-05-03 16:15:20 +02:00
Franz Pletz
e027ef7cb8 iw: 4.1 -> 4.3 2016-05-03 16:15:20 +02:00
Franz Pletz
e07b06d12a tgt: 1.0.60 -> 1.0.63 2016-05-03 16:15:20 +02:00
Franz Pletz
a6fdcea877 cimg: 1.5.9 -> 1.7.0 2016-05-03 16:15:20 +02:00
Joachim Fasting
b9fc31a415
popcorntime: mark as broken 
A temporary measure, short of removal, until
https://github.com/NixOS/nixpkgs/issues/15120 has been resolved.
 2016-05-03 16:09:36 +02:00
Franz Pletz
ffdcdb5124 znapzend: 0.15.3 -> 0.15.5 2016-05-03 16:05:14 +02:00
Franz Pletz
c0f4361902 php: Fix openssl module build 2016-05-03 16:04:40 +02:00
Franz Pletz
70ac1ec422 dovecot: 2.2.21 -> 2.2.24 2016-05-03 16:03:41 +02:00
Franz Pletz
d092838a1c postfix: 3.0.3 -> 3.0.4 2016-05-03 16:03:41 +02:00
Sebastian Gniazdowski
8ebae7fc3c zsh-navigation-tools: install all files 2016-05-03 13:44:36 +00:00
Franz Pletz
9139cf7d3f Merge pull request #15188 from avnik/rspamd 
Rspamd+rmilter update
 2016-05-03 15:06:11 +02:00
Alexander V. Nikolaev
7dea8d17a7 rmilter: 1.8.1 -> 1.8.4 2016-05-03 15:34:20 +03:00
Alexander V. Nikolaev
6f7fdda06e rspamd: 1.2.5 -> 1.2.6 2016-05-03 15:29:48 +03:00
Arseniy Seroka
e681d9f51e Merge pull request #15186 from romildo/new.greybird 
Greybird: init at 2016-03-11
 2016-05-03 14:24:55 +03:00
vbgl
a95df7d800 Merge pull request #15106 from vbgl/camlp5-6.16 
camlp5: 6.14 -> 6.16
 2016-05-03 12:56:16 +02:00
Nikolay Amiantov
fe0bb1efd1 imagemagick: add webp support 2016-05-03 13:19:41 +03:00
José Romildo Malaquias
4b2caa2409 Greybird: init at 2016-03-11 2016-05-03 06:45:17 -03:00
Robin Gloster
2ef7fbe4a0 Merge pull request #15185 from hrdinka/update/nsd 
nsd: 4.1.7 -> 4.1.9
 2016-05-03 11:44:54 +02:00
Robin Gloster
f9eb376eae Merge pull request #15178 from NeQuissimus/jdk8u92 
[WIP/Pretty big rebuild] openjdk: 8u76 -> 8u92
 2016-05-03 11:23:44 +02:00
rardiol
0ba62f7150 spring, springlobby update (#15182) 
* alure: init at 1.2

* spring: 96.0 -> 101.0

* springlobby: 0.195 -> 0.247
 2016-05-03 10:19:19 +01:00
Edward Tjörnhammar
066b5cb11a
idea.idea-{community,ultimate}: 2016.1 -> 2016.1.1 2016-05-03 11:01:21 +02:00
Peter Simons
66ff540ee6 haskell-lens: update version used by GHC 8.0.x 2016-05-03 10:22:22 +02:00
Peter Simons
967901f195 haskell-binary: update version used for GHC releases prior to 7.8.x 2016-05-03 10:22:22 +02:00
Peter Simons
ddb8c06c2d haskell-yi: mark as broken 2016-05-03 10:22:22 +02:00
Peter Simons
ec49307518 haskell-hakyll: fix test suite by providing "rev" in test environment 2016-05-03 10:22:22 +02:00
Peter Simons
f6980571ab Add LTS Haskell 5.15. 2016-05-03 10:22:22 +02:00
Peter Simons
f622804472 Add LTS Haskell 5.14. 2016-05-03 10:22:22 +02:00
Peter Simons
372782d1f0 hackage-packages.nix: update Haskell package set 
This update was generated by hackage2nix v20160406-5-gcb85ef4 using the following inputs:

  - Hackage: 24af5f79f4
  - LTS Haskell: 4d628b7b7e
  - Stackage Nightly: 2b431f312c
 2016-05-03 10:22:15 +02:00
Robin Gloster
8fc0e7f64d Merge pull request #15180 from groxxda/bump/bind9 
bind: 9.10.3-P4 -> 9.10.4
 2016-05-03 09:58:23 +02:00
Vincent Laporte
a42f845925 coq-dpdgraph: init at 0.5 2016-05-03 09:27:16 +02:00
Alexander Ried
6ca5c3667b kde: cleanup from closure-size merge (#15179) 
part of 98d8e1a160 and
7049bde4d5 got lost
 2016-05-03 08:59:18 +02:00
Alexander Ried
5be72c23ea bind: LibreSSL compatibility added upstream 2016-05-03 04:58:01 +02:00
Alexander Ried
19ce448380 bind: 9.10.3-P4 -> 9.10.4 2016-05-03 04:58:01 +02:00
Tobias Geerinckx-Rice
be3d012da4
highlight: 3.18 -> 3.28 2016-05-03 04:33:49 +02:00
Tobias Geerinckx-Rice
078f14e058
hicolor_icon_theme: 0.14 -> 0.15 2016-05-03 04:31:20 +02:00
Tobias Geerinckx-Rice
49fd7d9d08
autoconf-archive: 2015.09.25 -> 2016.03.20 2016-05-03 04:21:44 +02:00
Tobias Geerinckx-Rice
7a595cdfc3
libpwquality: 1.2.3 -> 1.3.0 2016-05-03 04:11:44 +02:00
Tobias Geerinckx-Rice
9c7f71cd61
unarj: 2.63a -> 2.65 2016-05-03 04:00:25 +02:00
Tobias Geerinckx-Rice
95aab50e81
efivar: 0.21 -> 0.23 2016-05-03 03:50:13 +02:00
Tobias Geerinckx-Rice
41de2cacb8
perlPackages.Thread-Queue: 3.05 -> 3.09 2016-05-03 03:31:25 +02:00
Tobias Geerinckx-Rice
15af160ec0
perlPackages.threads-shared: 1.48 -> 1.51 2016-05-03 03:30:56 +02:00
Tobias Geerinckx-Rice
b2ea81bd0f
perlPackages.threads: 2.02 -> 2.07 2016-05-03 03:30:27 +02:00
Tobias Geerinckx-Rice
78c500a8d1
perlPackages.PerlIO-eol: 0.14 -> 0.16 2016-05-03 03:29:34 +02:00
Tobias Geerinckx-Rice
5d25d7d987
rescuetime: use makeLibraryPath for LD_PRELOAD hack 2016-05-03 03:01:46 +02:00
Tobias Geerinckx-Rice
21b667e066
rescuetime: 2.8.9.1170 -> 2.9.10.1255 2016-05-03 02:43:03 +02:00
obadz
8536d8b4ed tcpflow: 1.4.5 -> 1.4.6 (#15151) 
Switch to fetchFromGitHub as website does not have latest version.
Default to not building against cairo to avoid dependencies on lots
of graphic libraries for a predominently command-line application.
 2016-05-03 01:39:46 +01:00
Tim Steinbach
84bf43a702 openjdk: 8u76 -> 8u92 2016-05-03 00:17:45 +00:00
Tobias Geerinckx-Rice
69ef7566a8
wireless-regdb: 2016-02-08 -> 2016-05-02 2016-05-03 02:01:12 +02:00
Tobias Geerinckx-Rice
d6c3407f7b
btrfs-progs: 4.5.1 -> 4.5.2 2016-05-03 02:01:12 +02:00
Tobias Geerinckx-Rice
6b6463dbd2
dpkg: 1.18.4 -> 1.18.5 2016-05-03 02:01:12 +02:00
Tobias Geerinckx-Rice
bc4465e23f
pythonPackages.sqlparse: 0.1.16 -> 0.1.18 2016-05-03 02:01:12 +02:00
Lluís Batlle i Rossell
94520a25ad Adding blktrace 
Tool to get traces of operations in block devices on linux.
 2016-05-03 00:26:27 +02:00
Tuomas Tynkkynen
c2caf86d21 Merge pull request #15176 from Baughn/mono 
mono: Update libX11 location
 2016-05-03 01:23:13 +03:00
Svein Ove Aas
5e0e2e6692 mono: Update libX11 location 2016-05-02 23:09:06 +01:00
Bart Brouns
57d9fd8f65 linuxband: init at 12.02.1 2016-05-02 23:28:32 +02:00
Arseniy Seroka
ee15d443c1 Merge pull request #15170 from magnetophon/MMA 
MMA: init at 15.12
 2016-05-03 00:23:19 +03:00
Tristan Helmich
7ec3023141 emby: 3.0.5932 -> 3.0.5934 (#15173) 2016-05-02 23:00:10 +02:00