Commit Graph

4391 Commits

Author SHA1 Message Date
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Eelco Dolstra
5c5f115603 firefox: Build without xulrunner
Fixes #2950.
2014-07-23 17:28:36 +02:00
Eelco Dolstra
4c2c0499f3 enscript: Build with the default GCC 2014-07-23 11:25:38 +02:00
Bjørn Forsman
3a060bbcc6 Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
Andrew Morsillo
0f8df0b6f2 Add evemu tool to emulate and record input device event data
[Bjørn Forsman:
 * wrap some long lines
 * tweak meta attrs (don't repeat package name, s/meta.maintainer/meta.maintainers/)
 * provide a version number (v2.0) for 'evemu' (for nix-env)
]
2014-07-22 23:35:38 +02:00
Eelco Dolstra
4f7289eec9 Don't use ensureDir 2014-07-22 11:01:32 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Pascal Wittmann
261ecebfaf Merge pull request #3323 from wjlroe/logstash-1.4.2
Logstash 1.4.2
2014-07-21 20:02:11 +02:00
Pascal Wittmann
5156b5d11d Merge pull request #3260 from linquize/gbdfed
gbdfed: add package 1.6
2014-07-21 19:49:26 +02:00
Bjørn Forsman
f8778ed82c openopc: new package
"OPC (OLE for Process Control) toolkit designed for use with Python"

This package contains a python module (OpenOPC) and a command line
client (opc). The OpenOPC Gateway Service for Windows is also copied to
$out, for reference.

It only works with python2.7 (not python3.x), so I'm not adding it to
python-packages.nix.

Also add needed dependency, python-pyro3, a distributed object
middleware for Python (IPC/RPC).

http://openopc.sourceforge.net/
2014-07-21 18:43:33 +02:00
Bjørn Forsman
cd3ba19ec0 asciidoc: add enableExtraPlugins expression argument
'enableExtraPlugins = true' enables all the extra plugins (filters and
backends) that are available in the expression. This simplifies the
configuration for users who want to have the fullest possible asciidoc
configuration (not needing to enable each individual plugin).
2014-07-20 23:03:27 +02:00
Bjørn Forsman
0ab24ad8c8 Revert "asciidoc: properly differentiate the "-full" variant in meta.description"
I changed my mind about this, I no longer think that meta.description
should differ depending on the package configuration. A package
configuration can be very fine grained, and I don't think it's
possible/preferable to describe this in meta.description.

This reverts commit 9033821c34.
2014-07-20 23:03:27 +02:00
William Roe
b6c2dc4e4f License, platforms and maintainer for Logstash 2014-07-20 16:09:19 +01:00
Pascal Wittmann
52cf78ef22 added cv: Tool that shows the progress of coreutils programs 2014-07-20 15:45:19 +02:00
Peter Simons
920f6007fa Merge pull request #3308 from matejc/connman124
connman: upgrade to version 1.24
2014-07-18 11:42:49 +02:00
Eelco Dolstra
2b2ba8bdf4 nixUnstable: Update to 1.8pre3679_f609eec 2014-07-18 00:22:08 +02:00
Matej Cotman
42f6d01bc2 connman: upgrade to version 1.24 2014-07-17 22:30:27 +02:00
William A. Kennington III
58485aa2c7 efibootmgr: Update 0.5.4 -> 0.7.0 2014-07-17 11:40:37 +02:00
William A. Kennington III
830f3b6b55 efivar: Add derivation 2014-07-17 11:40:37 +02:00
Pascal Wittmann
d518ef91c0 cpuminer: update from 2.3.3 to 2.4 and build with -O3 as described in the installation instructions 2014-07-17 00:15:44 +02:00
Pascal Wittmann
96f5affca9 bgs: update from 0.5 to 0.6 2014-07-15 19:50:29 +02:00
Eelco Dolstra
1dc5e5fb8c dhcpcd: Update to 6.4.2 2014-07-15 16:23:47 +02:00
Bjørn Forsman
4da81ca4f6 collectd: update meta attributes
Don't repeat package name in description, add maintainer, ...
2014-07-15 14:07:29 +02:00
Bjørn Forsman
3ba150db2f collectd: enable a bunch of plugins (by adding more deps)
These are plugins that are internal to collectd; they are bundled in the
source archive. Without this, many of the collectd plugins advertised on
their homepage don't actually work, so I think we should add this.

This change increases the closure size from 129 MiB to 621 MiB. The size
of the collectd store path itself goes from 2 MiB to 2.9 MiB.

Users wanting a smaller closure size can set some (or all) of the
optional inputs to "null" using ".override".

List of new plugins:

  amqp
  apache
  ascent
  bind
  curl
  curl_json
  curl_xml
  dbi
  dns
  iptables
  libvirt
  lvm
  memcachec
  modbus
  mysql
  nginx
  notify_desktop
  pinba
  ping
  postgresql
  redis
  rrdcached
  rrdtool
  sensors
  sigrok
  varnish
  write_http
  write_redis
  write_riemann
2014-07-15 14:07:29 +02:00
Eelco Dolstra
b9d19af3e6 Merge remote-tracking branch 'origin/master' into staging 2014-07-15 12:14:35 +02:00
Eelco Dolstra
45d327a346 jdiskreport: Update to 1.4.1 2014-07-15 11:52:20 +02:00
William Roe
a5783a977e Install all dirs for logstash
Also only patch shebangs in bin/ directory
2014-07-14 17:54:20 +01:00
Eelco Dolstra
c49afcc84a nixUnstable: Update to 1.8pre3666_5bcb982 2014-07-14 17:34:40 +02:00
Eelco Dolstra
78b5dea799 Revert "nixUnstable: Update to 1.8pre3666_5bcb982"
This reverts commit 3fff7cf9a2.
2014-07-14 17:34:13 +02:00
Eelco Dolstra
3fff7cf9a2 nixUnstable: Update to 1.8pre3666_5bcb982 2014-07-14 17:33:53 +02:00
Peter Simons
5bfb58a8a2 Re-generate Haskell packages with cabal2nix. 2014-07-14 17:33:52 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Pascal Wittmann
8c94b943de dvtm: update from 0.11 to 0.12 2014-07-14 15:40:09 +02:00
Peter Simons
d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Linquize
73028ef161 gbdfed: add package 1.6 2014-07-13 19:22:10 +08:00
John Wiegley
842fcdb4b4 texlive: update package paths, old versions no longer exist 2014-07-13 05:05:36 +00:00
John Wiegley
8983cb0917 httrack: upgrade 3.48.3 -> 3.48.17 2014-07-13 05:05:36 +00:00
Wout Mertens
cfe7441729 Add maintainer and platforms 2014-07-12 15:44:48 +02:00
tv
3fa1735b92 sec: add version 2.7.5 2014-07-12 13:19:08 +02:00
Christoph Hrdinka
a608a6f52a enblend-enfuse: update to version 4.1.3 2014-07-12 13:17:53 +02:00
Oliver Charles
7c90aab92a siege: Build with OpenSSL 2014-07-12 12:07:24 +01:00
Wout Mertens
ce81993a6b glmark2: Add glmark2 2014.03 2014-07-12 10:04:28 +02:00
William Roe
d79a58e392 Bump Logstash to 1.4.2 2014-07-11 17:50:02 +01:00
Bjørn Forsman
1ad2f843e2 volatility: fix indentation 2014-07-11 17:10:26 +02:00
Austin Seipp
e75d92791e Merge pull request #3236 from bosu/volatility
Add volatility: memory forensics framework
2014-07-11 03:35:45 -05:00
Boris Sukholitko
0ef036f48a Add volatility: memory forensics framework 2014-07-10 21:34:23 +03:00
Pascal Wittmann
c713d163c0 Update opkg to latest version, adpot it and add meta-information. 2014-07-10 10:57:28 +02:00
Luca Bruno
c4ad4b8802 wmctrl: apply patch from debian to fix listing windows 2014-07-09 21:54:02 +02:00
Cillian de Róiste
26e36dcc80 Add Mark Lord's symlinks utility 2014-07-08 19:19:43 +02:00
Eelco Dolstra
8aacdfee7c gawk: Remove unnecessary ‘gawk-<version>’ copy
This saves > 600 KiB.
2014-07-08 15:43:05 +02:00
zimbatm
a05ae93c66 Update direnv to v2.4.0 2014-07-08 00:20:21 +02:00
Rickard Nilsson
233825760c New pkg: syslog-ng-incubator
A collection of tools and modules for syslog-ng
2014-07-07 23:58:24 +02:00
Rickard Nilsson
0ee69ef529 New pkg: riemann-c-client version 1.1.1
A C client library for the Riemann monitoring system
2014-07-07 23:58:24 +02:00
Rob Vermaas
83e1ff846c Upgrade rsyslog to latest (v7) stable release. Added liblogging (new dependency of rsyslog). 2014-07-07 16:23:54 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Jascha Geerds
28322c8d58 Packaging plasma-nm and its dependencies 2014-07-05 13:54:01 +02:00
Michael Raskin
94e11b2f91 Update autocutsel 2014-07-04 21:51:43 +04:00
Michael Raskin
cb84c4d6a4 babeld: update from 1.4.3 to 1.5.0 2014-07-04 21:45:07 +04:00
Michael Raskin
3329d68199 aria2: update from 1.18.1 to 1.18.5 2014-07-04 21:42:31 +04:00
Michael Raskin
0b9a382fc8 Apparently nobody ever noticed that aria was already packaged when packaging it once more; merging expressions 2014-07-04 21:42:14 +04:00
Eelco Dolstra
e443fcb37f openresolv: Update to 3.5.7 2014-07-03 12:18:44 +02:00
Eelco Dolstra
993e8da496 dhcpcd: Update to 6.4.0
The lxc_ro_promote_secondaries patch no longer applies so I disabled
it for now (@offlinehacker).
2014-07-03 12:18:44 +02:00
Moritz Ulrich
27515430ca mu: Bump to 0.9.9.6. 2014-07-03 11:15:55 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Michael Raskin
040c0e8d7d Allow autoupdates for altermime 2014-07-01 12:47:15 +04:00
Austin Seipp
67d992c100 ceph: fix libatomic_ops dependency
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-30 12:03:08 -05:00
Peter Simons
6d068be1bf cabal-install: update to version 1.20.0.3 2014-06-30 17:03:07 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Michael Raskin
127175d27f Update gummiboot to the latest 2014-06-30 11:05:40 +04:00
Michael Raskin
dcf5e85c2f Merge pull request #2595 from wkennington/master.ecryptfs
ecryptfs: Update from 82 -> 104
2014-06-30 09:26:24 +04:00
John Wiegley
af5f5ec84d ceph: default atomicops dependency to null
I have no such dependency on my system, so this prevent nix-env from
working.
2014-06-28 21:38:16 -07:00
Alexander Kjeldaas
d80ded0e7d Added the ceph filesystem. 2014-06-28 20:43:58 -05:00
Alexander Kjeldaas
f1b7cb7ceb Added lib output to xfsprogs.
This only contains static archives since xfsprogs is compiled
with dynamic libraries disabled.
2014-06-28 20:43:51 -05:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
Shea Levy
662ecd277a nix: propagate boehmgc 2014-06-27 18:15:05 -04:00
Moritz Maxeiner
a229294c13 Fix network-manager-applet startup issue 'GLib-GIO-Message: Using the 'memory' GSettings backend. Your settings will not be saved or shared with other applications.'
(cherry picked from commit 51dc1ddb7c6e974e36c1a2d8701fbc7c254cbc72)

Conflicts:
	pkgs/tools/networking/network-manager-applet/default.nix
2014-06-27 10:25:30 +02:00
Jos van den Oever
a6f11f262e Update povray.
Current master version has 404 on tar.gz.
2014-06-26 11:31:59 +02:00
Vladimír Čunát
99da7b85cb gnupg: security update 2.0.22 -> .24, CVE-2014-4617
Close #3091.
2014-06-26 11:04:30 +02:00
John Wiegley
39db3547a9 Merge pull request #3055 from chrisfarms/fix-sudo
Fix sudo installation issue #3027
2014-06-25 17:21:36 -07:00
John Wiegley
7c85cef85f dvju2pdf: corrections to the installPhase and dependencies 2014-06-25 11:18:18 -07:00
John Wiegley
cda3d5d59b djvu2pdf: new expression 2014-06-25 11:14:53 -07:00
Rickard Nilsson
c11d9daa58 syslog-ng: Add perl to buildInputs so perl scripts in output are fixed correctly 2014-06-25 13:44:31 +02:00
John Wiegley
29a6f1cc78 Merge pull request #3037 from cstrahan/extra-fetchers
add nix-prefetch-zip
2014-06-24 15:17:49 -07:00
Rickard Nilsson
41f5e0121c syslog-ng: Enable systemd support 2014-06-24 23:52:54 +02:00
John Wiegley
f4b3bc0334 diffstat: weaken platform requirement
This fixes a change made in 3ae765278f.
2014-06-24 14:45:33 -07:00
Peter Simons
fd73d2b13b gnupg1: update to version 1.4.17 2014-06-24 19:09:33 +02:00
Florian Friesdorf
ba654b9368 Merge pull request #3056 from aherrmann/pr_tables
Python module tables
2014-06-23 22:58:04 +02:00
Bjørn Forsman
3ad289dff9 lftp: remove unused 'xz' expression argument
xz used to be in buildInputs but was removed in commit
d4d7931a62 (Cleanup: remove obsolete
references to ‘xz’, which is in stdenv).
2014-06-23 16:41:11 +02:00
Bjørn Forsman
460ea9e841 lftp: update 4.4.16 -> 4.5.2
Changelog: http://lftp.yar.ru/news.html#4.5.2
2014-06-23 16:41:11 +02:00
Rickard Nilsson
3bf8199613 Merge pull request #3070 from proger/glusterfs-3.5
glusterfs: update to 3.5.0
2014-06-23 16:33:37 +02:00
Vladimir Kirillov
470f8cccc2 glusterfs: update to 3.5.0 2014-06-23 17:14:26 +03:00
Bjørn Forsman
6ec01b7513 zbar: tweak description and add longDescription
"Bar code reader" is what they call it on the homepage
(http://zbar.sourceforge.net/).
2014-06-23 16:02:45 +02:00
Bjørn Forsman
9f744961b8 zip: add meta.description 2014-06-23 13:35:08 +02:00
Charles Strahan
9bd8dffd77 require gnused for all prefetch scripts 2014-06-23 01:25:40 -04:00
Bjørn Forsman
e805731cac convmv: add meta.description 2014-06-22 23:03:36 +02:00
Bjørn Forsman
5d97335b6d colordiff: update 1.0.9 -> 1.0.13 2014-06-22 23:00:14 +02:00
Bjørn Forsman
7061116faa colordiff: add meta attributes 2014-06-22 22:57:08 +02:00
Bjørn Forsman
4d120e29c5 catdoc: add meta.description 2014-06-22 22:48:09 +02:00
Bjørn Forsman
9033821c34 asciidoc: properly differentiate the "-full" variant in meta.description 2014-06-22 22:22:51 +02:00
Andreas Herrmann
5a96043637 hdf5: Update to 1.8.13 2014-06-22 20:05:20 +02:00
Andreas Herrmann
d1f7bc7bcf hdf5: Add szip as an optional dependency
This adds additional compression modes to hdf5.

Note: The szip license may not be compatible with everyone's use case. Hence,
it is an optional dependency.
2014-06-22 20:05:20 +02:00
Andreas Herrmann
4528ebf509 hdf5: Add zlib as optional dependency
This adds addition compression modes to the hdf5 library.

I am adding this, because pytables depends on it.
2014-06-22 20:05:20 +02:00
Chris Farmiloe
fbfdc8e2dc keep fallback visudo editor as nano 2014-06-22 19:50:40 +02:00
Chris Farmiloe
3dec61a8a6 Fix sudo not installing due to timedir deprecation 2014-06-22 19:42:32 +02:00
Bjørn Forsman
3ae765278f diffstat: clean up expression
Most importantly, add meta.description and meta.platforms.
2014-06-22 13:39:28 +02:00
Charles Strahan
400b94e120 fix bzr prefetcher on darwin 2014-06-22 05:07:09 -04:00
Charles Strahan
a6a729b207 add nix-prefetch-zip 2014-06-22 04:59:18 -04:00
Michael Raskin
2915999069 Add missing dependency to gtk-vnc 2014-06-19 18:23:14 +04:00
Austin Seipp
72a0bcd49f Merge pull request #2957 from doublec/xpra
Change to xpra version 0.11.6 as 0.12.5 was not working
2014-06-18 16:25:44 -05:00
Austin Seipp
55fee4ffce Merge pull request #3004 from offlinehacker/pkgs/logstash/update_1_3_3
logstash: update to 1.3.3
2014-06-18 16:20:00 -05:00
Jaka Hudoklin
d4506fd7eb logstash: update to 1.3.3 2014-06-18 13:29:26 +02:00
William A. Kennington III
1bb2a094fd sudo: Update 1.8.9p4 -> 1.8.10p3 2014-06-17 22:41:32 -05:00
William A. Kennington III
ef4ea24420 sudo: Always keepVisudo in order to simplify sudo build 2014-06-17 22:41:32 -05:00
Austin Seipp
fd4c2d893f duo-unix: upgrade, fix full name + version
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-17 17:06:31 -05:00
Austin Seipp
7f800e8155 jd-gui: version 0.3.5
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-17 14:44:49 -05:00
Shea Levy
fec288f404 Merge branch 's3cmd-git' of git://github.com/fmapfmapfmap/nixpkgs 2014-06-17 09:56:01 -04:00
Shea Levy
52aa2afdcd nixUnstable: bump 2014-06-16 10:44:02 -04:00
Vladimír Čunát
1b78ca58bc Merge #2798: stdenv and a few other big updates
Stdenv-changing things:
    - gcc 4.8.2 -> 4.8.3
    - long-running grsecurity branch
Others:
    - pkgconfig update
    - CVE for libtasn1, dbus

Conflicts (simple):
    pkgs/development/compilers/ghc/7.6.3.nix
2014-06-16 10:23:36 +02:00
Chris Double
e3f4d343a3 Change to xpra version 0.11.6 as 0.12.5 was not working
Version 0.11.6 was the latest version that I was able to get building
and running on NixOS. Unfortunately my previous commit for 0.12.5 was
an error and incomplete.
2014-06-16 12:12:46 +12:00
Mateusz Kowalczyk
8ae9d533b7 rtorrent: update to 0.9.4 2014-06-16 01:05:22 +02:00
Mateusz Kowalczyk
d97d34398c libtorrent: update to 0.13.4 2014-06-16 01:05:11 +02:00
Mateusz Kowalczyk
b5ca04f4a8 nitrogen: patchShebangs instead of patchfile + /usr/bin/env
This hopefully fixes the build on Hydra.
2014-06-15 23:34:20 +02:00
Anders Claesson
05402bc7c8 tree: update to version 1.7.0 2014-06-15 23:31:39 +02:00
Vladimír Čunát
9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
Kosyrev Serge
eda6fd83a8 xtrace: fix build and update to 1.3.1
Alioth now requires a login before you can download tarballs.
2014-06-15 14:10:35 +04:00
Michael Raskin
213312b667 Update GlusterFS to 3.4.3 2014-06-14 00:23:12 +04:00
Jonathan Glines
43432b9fca Added a long description. Added the patch file. 2014-06-13 12:08:44 -06:00
Jonathan Glines
2784866ffd Merge branch 'master' into nitrogen. Added maintainer and license.
Conflicts:
	pkgs/tools/X11/nitrogen/default.nix
2014-06-13 11:54:19 -06:00
Jonathan Glines
c977673bb5 Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen
Conflicts:
	pkgs/tools/X11/nitrogen/default.nix
2014-06-13 11:41:40 -06:00
Jonathan Glines
c55be95e6e Nitrogen build working. Missing custom icons in GUI. 2014-06-13 11:37:05 -06:00
Jonathan Glines
93ea13874c Working on a package for nitrogen. 2014-06-13 11:37:05 -06:00
Chris Double
2deb3ca0aa Update tor to 0.2.4.22 and tor browser to 3.6.2 2014-06-13 14:21:53 +12:00
Vladimír Čunát
de12094b0e Merge recent master 2014-06-12 09:15:11 +02:00
Vladimír Čunát
1bcc2aa216 fix licenCe typos 2014-06-12 09:12:14 +02:00
Anders Claesson
d7491e429a pass: install bash completion script 2014-06-12 07:46:39 +02:00
Daniel Bergey
af3d448d33 pass(word-store): add option to include xclip in PATH
xclip is necessary for pass(word-store) to send passwords to the
clipboard / X-selection, rather than echoing to the terminal.

The option currently defaults to false, because someone may not want the
dependency on X libraries and also pass is really quick to build (it's
just a shell script).
2014-06-11 23:36:28 +02:00
Bjørn Forsman
86d19319d6 t1utils: new package
t1utils is a collection of simple Type 1 font manipulation programs.
2014-06-11 21:17:49 +02:00
Vladimír Čunát
e1775895a6 Merge #2711: add ansible-1.6.1
Conflicts (trivial):
	lib/maintainers.nix
2014-06-11 20:29:55 +02:00
Vladimír Čunát
f2352f7ecf Merge recent master 2014-06-10 20:14:08 +02:00
Benno Fünfstück
c6bd4d2973 nix-prefetch-scripts: new expression 2014-06-10 19:26:20 +02:00
John Wiegley
651595c969 texlive: add potrace dependency without qualification 2014-06-10 08:57:52 +00:00
Michael Raskin
a852b53bff Add potrace to texLive dependencies 2014-06-10 11:25:03 +04:00
Michael Raskin
b7b58f90d8 Update ZPAQ 2014-06-10 09:41:23 +04:00
John Wiegley
5100a2bbb3 texlive: upgrade to 20140528 2014-06-09 20:52:19 -05:00
Sander van der Burg
6b6f098fd1 disnix: bump versions and update module to use its latest features 2014-06-09 23:46:30 +02:00
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00
Rickard Nilsson
9018d3c4f2 tinc: Update from 1.0.23 to 1.0.24 2014-06-09 15:14:05 +02:00
Jonathan Glines
8af05e82a0 Merge branch 'master' into nitrogen 2014-06-08 16:59:40 -06:00
Michael Raskin
4b144de367 Allow to keep visudo. Useful for checking sudoers syntax 2014-06-09 00:54:21 +04:00
Austin Seipp
80f3e943b1 dd-agent: 4.2.1 -> 4.3.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-06 23:14:54 -05:00