JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,852 Commits 2 Branches 0 Tags 13 GiB
3adcc60770
Commit Graph

8656 Commits

Author SHA1 Message Date
Thomas Tuegel
8cf78bf5f4 update various packages to use Qt 5.4 2015-02-21 11:39:20 -06:00
Arseniy Seroka
18ec13d9d2 Merge pull request #6483 from qknight/kino-1.3.4-build-fix 
kino-1.3.4 fixes
 2015-02-21 13:32:40 +03:00
John Wiegley
6f30dcd456 emacs24Macport: upgrade Macport patch to 5.1 -> 5.3 2015-02-21 03:38:07 -06:00
Nathaniel Baxter
e0cefbca65 virt-viewer: update from 1.0 to 2.0 2015-02-21 16:29:50 +11:00
Nathaniel Baxter
ce7449f68b virt-manager: update from 1.0.1 to 1.1.0 2015-02-21 16:29:50 +11:00
Carles Pagès
1aed33f68b homebank: update to 5.0.0 2015-02-20 23:16:29 +01:00
Joachim Schiele
1a35a0ad34 kino-1.3.4 fixes; thanks to gentoo 2015-02-20 22:44:10 +01:00
Bjørn Forsman
97875ac175 bridge-utils: align attrname with pkgname 2015-02-20 22:30:51 +01:00
Arseniy Seroka
6cd330b3e7 twmn: fix name (use date) and update pkg 2015-02-20 22:14:45 +03:00
Arseniy Seroka
bbbb9c0f93 swh-lv2: fix name (use date) 2015-02-20 22:14:44 +03:00
Arseniy Seroka
db35cb4937 DISTRHO: fix name (use date) and update pkg 2015-02-20 22:14:44 +03:00
Pascal Wittmann
c1f50b6222 calibre: update from 2.19.0 to 2.20.0 2015-02-20 13:08:47 +01:00
Cillian de Róiste
cfb68ce4f0 lmms: update from 1.1.0 to 1.1.2 2015-02-20 10:39:47 +01:00
Damien Cassou
bc58f50eab Merge pull request #6338 from DamienCassou/plm-2.5 
New package PLM: Programmer's Learning Machine
 2015-02-20 09:17:27 +01:00
Vladimír Čunát
7d129a88a5 merge #5333: altcoins: a new category of applications 
Conflicts (openssl override moved to pkgs/applications/altcoins/default.nix):
	pkgs/top-level/all-packages.nix
 2015-02-19 23:36:41 +01:00
Franz Pletz
48f4290cd8 Update silc-client to 1.1.11 2015-02-19 19:31:29 +01:00
William A. Kennington III
3d2c7d791e weston: Update to 1.7.0 2015-02-19 10:13:44 -08:00
Jaka Hudoklin
ebfadc2fc9 Merge pull request #6452 from rushmorem/update-chronos-port 
Update chronos default port
 2015-02-19 14:13:00 +01:00
rushmorem
74b40e9a43 Add marathon mesos framework 2015-02-19 13:30:00 +02:00
rushmorem
a661802d29 Update chronos default port 
Update chronos default port to match the one documented on
their website (http://airbnb.github.io/chronos). The one in
their repo (the current one) clashes with the marathon documented
one.
 2015-02-19 12:31:12 +02:00
bstrik
6920d4fbeb dockapps for windowmaker 2015-02-18 21:53:47 +01:00
Nikolay Amiantov
c6e0178d40 gitlab: fix checksum 2015-02-18 19:25:13 +03:00
Sergey Mironov
4fea283349 sipcmd: add the command-line SIP client 2015-02-18 11:52:05 +03:00
Dan Peebles
a78d164b1e Minor fixes for git on darwin (libiconv and Security dependencies) 2015-02-17 22:30:59 -05:00
Shea Levy
2f061ff16b Merge remote-tracking branch 'origin/staging' 
Darwin and haskell fixes.
 2015-02-17 13:52:37 -05:00
lethalman
00ebcd0c36 Merge pull request #6387 from nathanielbaxter/dev/cdrtools 
cdrtools: Update to 3.00
 2015-02-17 13:12:39 +01:00
Edward Tjörnhammar
47203a86bf unison: sha correction 2015-02-17 12:35:29 +01:00
Edward Tjörnhammar
17e6dd2da3 ideas: refactoring, remove snappyPatch as all derivative products are based on the 14 series 2015-02-17 12:27:08 +01:00
Nathaniel Baxter
0d1a707784 cdrtools: Add unfree license 2015-02-17 22:23:10 +11:00
Marco
5f6e6b1661 Update HOL Light to r218 2015-02-17 10:23:51 +01:00
Nathaniel Baxter
2366453d2f cdrtools: Update to 3.00 2015-02-17 18:00:53 +11:00
William A. Kennington III
d847059c55 Merge pull request #6380 from codyopel/docker-fix 
docker: fix shebangs, closes #6368
 2015-02-16 19:01:27 -08:00
codyopel
6d3fee045a docker: fix shebangs, closes #6368 2015-02-16 21:41:46 -05:00
James Cook
602860e259 Merge pull request #6352 from falsifian/sox_CVE-2014-8145 
sox: Patches for CVE-2014-8145
 2015-02-16 13:39:11 -08:00
James Cook
6daf9aa922 Merge pull request #5995 from ts468/qemu-vm 
Update QEMU Nixos Virtual Machine
 2015-02-16 13:13:26 -08:00
Thomas Strobel
80afabd5b5 Update QEMU Nixos Virtual Machine 
The Nixos Qemu VM that are used for VM tests can now start without
boot menu even when using a bootloader.
The Nixos Qemu VM with bootloader can emulate a EFI boot now.
 2015-02-16 20:07:42 +01:00
Vincent Laporte
c3380ce3b0 smplayer: update from 14.9.0 to 14.9.0.6690 2015-02-16 13:31:13 +01:00
Anders Papitto
ec437bff92 replace use of which with command -v in i3 scripts 2015-02-16 08:08:16 +00:00
William A. Kennington III
bc11e1aee8 Merge pull request #6359 from codyopel/qbit 
qbittorrent: add gui & webui optionals
 2015-02-15 19:10:18 -08:00
codyopel
e9c0bdb93e qbittorrent: add gui & webui optionals 2015-02-15 17:43:39 -05:00
Cillian de Róiste
33fa065f17 qtractor: update from 0.6.4 to 0.6.5 2015-02-15 20:36:41 +01:00
Cillian de Róiste
0a00a351ab yoshimi: update from 1.3.1 to 1.3.2 2015-02-15 20:36:38 +01:00
AndersonTorres
f19ed980a2 Sawfish (git): New Package 
Sawfish is a versatile, Lisp-based window manager

In that commit I include all Sawfish stack:
- librep, a lisp system;
- rep-gtk, bindings for gtk
- sawfish, the window manager
 2015-02-15 19:42:53 +03:00
Marco Maggesi
07bac418d2 Update fossil to version 1.30 2015-02-15 15:34:29 +01:00
James Cook
721635b0dd sox: Change homepage 
The page at mega-nerd.com does not seem to be about sox at all.
 2015-02-15 00:36:42 -08:00
James Cook
cf11e28599 sox: Patches for CVE-2014-8145 
Found via RedHat bug 1174792.  It was not clear whether these address a
NULL dereference and a division by zero.
 2015-02-15 00:12:29 -08:00
codyopel
b03ded550f lame: move to libraries & fix license 2015-02-14 19:06:38 -05:00
codyopel
d62d6750f0 lame: refactor & add optionals 2015-02-14 16:41:15 -05:00
Peter Simons
600135bba5 Merge remote-tracking branch 'master' into staging. 2015-02-13 22:17:12 +01:00
Peter Simons
54ce1a1810 Merge remote-tracking branch 'origin/master' into staging. 
Conflicts:
      pkgs/development/compilers/ghc/head.nix
      pkgs/top-level/haskell-ng.nix
 2015-02-13 22:13:25 +01:00
vbgl
bc4ffd6ad6 Merge pull request #6331 from bobvanderlinden/gnumeric-gio-extra-modules 
gnumeric: make use of GIO_EXTRA_MODULES in wrapper
 2015-02-13 18:08:03 +01:00
Lluís Batlle i Rossell
569a02b725 Updating weka to 3.6.12. 
(cherry picked from commit cd417206f93be49dd848ce1b3633e335faed941f)
 2015-02-13 16:22:39 +01:00
Damien Cassou
e7a161d4f2 New package PLM: Programmer's Learning Machine 2015-02-13 16:06:19 +01:00
Bob van der Linden
3f7917ed8a gnumeric: make use of GIO_EXTRA_MODULES in wrapper 2015-02-13 15:33:55 +01:00
Rickard Nilsson
da6abad31a vimb: Update from 2.8 to 2.9 2015-02-13 15:06:46 +01:00
koral
25cc033426 impressive: 0.10.3 -> 0.10.5 (close #6228) 2015-02-12 21:55:45 +01:00
Vladimír Čunát
0893fc1e7b djvulibre: small update 
I find no new build failures of depending packages.
 2015-02-12 20:32:24 +01:00
Vladimír Čunát
4dfafb8ff7 lyx: maintenance update 2015-02-12 20:23:24 +01:00
Shea Levy
127efcd6f6 Merge branch 'kill-libiconv' of git://github.com/gridaphobe/nixpkgs into staging 
Took "ours" for the conflict and changed libiconvOrEmpty to libiconv

Conflicts:
	pkgs/applications/audio/ncmpcpp/default.nix
 2015-02-11 19:37:22 -05:00
William A. Kennington III
505ab03a1e notbit: Update git 2015-02-11 15:23:31 -08:00
cillianderoiste
26127df6cb Merge pull request #6288 from ehmry/ratox 
ratox: bump to 0.2.1
 2015-02-10 23:08:52 +01:00
Emery Hemingway
f5b3ca1473 ratox: bump to 0.2.1 2015-02-10 12:10:51 -05:00
Vincent Laporte
10a84b3c69 bluefish: update from 2.2.6 to 2.2.7 2015-02-10 14:03:33 +01:00
lethalman
7614b2f984 Merge pull request #6229 from devhell/canto 
canto-{curses,daemon}: Add packages
 2015-02-10 10:34:11 +01:00
William A. Kennington III
1791adefb2 Merge pull request #6271 from ktosiek/taskwarrior 
Bump TaskWarrior to 2.4.0
 2015-02-09 17:10:05 -08:00
William A. Kennington III
b1737e8c91 Merge pull request #6275 from ehmry/picard 
picard: 1.3 -> 1.3.2
 2015-02-09 17:09:20 -08:00
William A. Kennington III
775f8c84dd Merge pull request #6274 from brendanlong/syncthing-0.10.22 
syncthing: Update to 0.10.22
 2015-02-09 17:08:57 -08:00
Emery Hemingway
9ca2a22136 picard: 1.3 -> 1.3.2 2015-02-09 19:23:52 -05:00
Brendan Long
a88b262459 syncthing: Update to 0.10.22 2015-02-09 17:55:18 -06:00
codyopel
1d2e7bd803 sakura: 2.4.2 -> 3.2.0 2015-02-09 18:23:50 -05:00
Peter Simons
7b99c149a4 Merge branch 'master' into staging. 2015-02-09 16:51:10 +01:00
Mateusz Kowalczyk
6e479db730 mkvtoolnix: update to 7.6.0 2015-02-09 12:43:09 +00:00
Mateusz Kowalczyk
2875250c5f mcomix: update to 1.01 2015-02-09 12:16:38 +00:00
Pascal Wittmann
6b5658bf23 bro: update from 2.3.1 to 2.3.2 2015-02-09 12:20:10 +01:00
Nikolay Amiantov
a52db30bdb tkabber: update version 2015-02-09 13:10:12 +03:00
Dan Peebles
d8ad39d2e6 Purification in preparation for pure-darwin merge (shouldsn't hurt anything in the meantime) 2015-02-08 19:15:09 -05:00
Dan Peebles
063c901d6c Minor purification of emacs24Macport (for upcoming pure darwin stdenv) 2015-02-08 18:53:38 -05:00
William A. Kennington III
637ed5c6f6 Merge pull request #6226 from codyopel/ncmpcpp 
ncmpcpp: add support for optional screens
 2015-02-08 14:34:17 -08:00
codyopel
b9bc4fdf1a ncmpcpp: refactor and add support for optional screens 2015-02-08 16:58:32 -05:00
Tomasz Kontusz
9fa910521e Bump TaskWarrior to 2.4.0 2015-02-08 22:48:41 +01:00
Edward Tjörnhammar
e546997042 makemkv: 1.9.0 -> 1.9.1 2015-02-08 22:40:25 +01:00
William A. Kennington III
5a1089d024 Merge pull request #6245 from edwtjo/samba-collate-urls 
fetchurl: collate samba project urls into a mirror
 2015-02-08 13:38:01 -08:00
Edward Tjörnhammar
33a8a51657 fetchurl: collate samba project urls into a mirror 2015-02-08 22:29:27 +01:00
devhell
37f58c4f46 canto-{curses,daemon}: Add packages 
This adds canto-daemon, a feedparser background service, and
canto-curses, a highly customizable curses-based frontend.
 2015-02-08 14:16:17 +00:00
Eric Seidel
e08b9ab8d3 kill libiconvOr* 
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
 2015-02-07 20:29:28 -08:00
lethalman
8b236f2daf Merge pull request #6119 from lethalman/go 
Go packages, buildGoPackage
 2015-02-07 21:30:30 +01:00
Cillian de Róiste
90e9c1a63c synfigstudio 0.64.2 -> 0.64.3 2015-02-07 18:21:18 +01:00
Jaka Hudoklin
f85abb041a Merge pull request #5622 from offlinehacker/panamax 
panamax: new package and service
 2015-02-07 14:56:25 +00:00
viric
5ae6bf304c Merge pull request #6210 from ehmry/ratox 
ratox: initial package at v0.2
 2015-02-07 15:47:07 +01:00
Emery Hemingway
b3118791e3 ratox: initial package 
http://ratox.2f30.org/
 2015-02-07 09:33:18 -05:00
Matej Cotman
8967a2b32d panamax: rewrite using 'pleasent ruby' 2015-02-07 15:32:20 +01:00
Jaka Hudoklin
ae34f923f7 panamax: simplify, refactor, add test 2015-02-07 15:32:20 +01:00
Matej Cotman
8c79a2df63 panamax: new package and service 2015-02-07 15:32:20 +01:00
Edward Tjörnhammar
b65e6e873f ideas: use secure transport 2015-02-07 13:20:03 +01:00
Alexei Boronine
f80828c937 idea: change source URLs to "nicer" ones (close #6211) 2015-02-07 13:09:50 +01:00
Nathaniel Baxter
09fc276a11 flashplayer: Minor security update to 11.2.202.442 2015-02-07 11:04:48 +11:00
William A. Kennington III
67f28ac1a9 umurmur: Add meta platforms 2015-02-06 13:15:23 -08:00
William A. Kennington III
c6749d0306 umurmur: 0.2.13 -> 0.2.15 2015-02-06 13:13:49 -08:00
Pascal Wittmann
641cdbb8cf unison: update from 2.40.102 to 2.48.3 2015-02-06 19:59:14 +01:00
Luca Bruno
f53e18fc40 Fix luakit description 2015-02-06 14:50:39 +01:00
lethalman
4428076bd1 Merge pull request #5805 from matthiasbeyer/add-luakit 
[WIP] Add package: luakit
 2015-02-06 14:50:00 +01:00
Matthias Beyer
b5baa2c5e4 Add package: luakit 
This patch adds the luakit browser. It has to be build using lua5.1, I
tried 5.2 but I couldn't run luakit due to a runtime error with it.

It also uses gtk3 here, override to use gtk2, which should also work.

Suggested-by: Benno Fünfstück <benno.fuenfstueck@gmail.com>
 2015-02-06 14:19:16 +01:00
Peter Simons
ad1417ed0e git: update to version 2.3.0 2015-02-06 13:59:57 +01:00
Pascal Wittmann
ad6421fb03 calibre: update from 2.18.0 to 2.19.0 2015-02-06 12:09:03 +01:00
Domen Kožar
fdb5cf8107 chromium: remove preferLocalBuild due to intense IO in VM tests 
(cherry picked from commit 84bd62da0a63e18fa285bacf0e648b82d601816e)
Signed-off-by: Domen Kožar <domen@dev.si>
 2015-02-06 12:08:43 +01:00
Tobias Geerinckx-Rice
934910acdd Merge pull request #6185 from fredlebel/mdp-0.93 
Added mdp-0.93
 2015-02-06 03:15:55 +01:00
Frederic LeBel
1e509d011d Added mdp-0.93 
A command-line based markdown presentation tool.
 2015-02-05 21:04:33 -05:00
Luca Bruno
3f718a743d Add dontInstallSrc flag to buildGoPackage 2015-02-05 18:07:28 +01:00
Arseniy Seroka
5b52dd91e6 Merge pull request #6158 from bdimcheff/upgrade-musicmanager 
upgrade google-musicmanager to beta_1.0.129.6633-r0
 2015-02-05 18:42:22 +03:00
Luca Bruno
4ce497e74f Use buildFlags in buildGoPackage instead of makeFlags 2015-02-05 13:13:14 +01:00
Luca Bruno
e6e4c867e5 Port syncthing to buildGoPackage 2015-02-05 13:12:10 +01:00
Rok Garbas
217f6ed01b weechat: update to 1.1.1 2015-02-05 08:40:07 +01:00
Brandon Dimcheff
c209db4342 upgrade google-musicmanager to beta_1.0.129.6633-r0 2015-02-04 17:07:15 -05:00
Vladimír Čunát
4495d06a7f Merge branch 'master' into staging 
Conflicts (simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/top-level/all-packages.nix
 2015-02-04 22:00:07 +01:00
Marcus Crestani
852b6c1093 rxvt-unicode: On OS X, add .PHONY target to Makefile.in. 
Due to the case-insensitive file system on OS X, `make install` does
nothing, since it sees the INSTALL file as the up-to-date target.
Adding a .PHONY target to the Makefile fixes this.
 2015-02-04 20:44:19 +01:00
Marcus Crestani
8e2fb7c816 i3: Set checkPhase only when on Linux. 2015-02-04 20:44:19 +01:00
Luca Bruno
9dfa4b487f Port pond to buildGoPackage 2015-02-04 13:14:15 +01:00
Bjørn Forsman
bc18d0dbc0 mendeley: gcc.gcc -> gcc.cc (fix evaluation) 2015-02-04 07:16:19 +01:00
Shea Levy
5ac0318332 Merge branch 'new-darwin-stdenv' of git://github.com/gridaphobe/nixpkgs 
refs #6122
 2015-02-03 18:19:22 -05:00
Eric Seidel
fe49487a05 fix evaluation 2015-02-03 14:31:07 -08:00
Domen Kožar
f8dacd8528 Merge pull request #6090 from richardlarocque/xbmc_rtmp 
xbmc: Add rtmp support
 2015-02-03 23:22:52 +01:00
Nikolay Amiantov
93928557b9 Merge pull request #6107 from abbradar/updates 
Update my packages
 2015-02-03 15:39:26 +03:00
Peter Simons
31ecab7b7e mikmod: update to version 3.2.6 2015-02-03 12:46:39 +01:00
Nikolay Amiantov
9b631cd0f8 bomi: rename from cmplayer and update 2015-02-03 14:27:43 +03:00
Peter Simons
b7ecd5e729 Merge pull request #5025 from abbradar/xmonad-wrapper 
nixos/xmonad: make a wrapper
 2015-02-03 11:52:09 +01:00
Sou Bunnbu
7f17bfc37b Merge pull request #6113 from AndersonTorres/windowmaker 
WindowMaker: adding support for more image formats
 2015-02-03 11:21:22 +08:00
Shea Levy
aea1254f96 cc-wrapper merge fixes 2015-02-02 21:30:05 -05: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
AndersonTorres
1c0c07c2ed WindowMaker: adding support for more image formats 
Now Windowmaker is built with support for almost all image formats
(except WEBP - its autodetection is failing)
 2015-02-02 23:45:59 -02:00
Nikolay Amiantov
b7bb524f04 nixos/xmonad: move to haskell-ng and make a wrapper 2015-02-03 01:05:23 +03:00
Kosyrev Serge
b9cc04329b fix 404 URLs (close #6105) 2015-02-02 22:05:51 +01:00
Edward Tjörnhammar
f8038b0c6c kodi: 14.0 -> 14.1, added myself as maintainer 2015-02-02 20:15:52 +01:00
Andrey Arapov
7ed1435aa9 owncloud: update to 1.7.1 2015-02-02 18:28:55 +01:00
Nikolay Amiantov
28d9da7498 pidgin-otr: adopt and add platforms 2015-02-02 14:00:17 +03:00
Tobias Geerinckx-Rice
1fde266b48 Update keyfinder-cli 20150125 -> 20150130 2015-02-02 02:02:29 +01:00
Richard Larocque
d221fd91a3 xbmc: Add rtmp support 2015-02-01 13:56:26 -08:00
Mateusz Kowalczyk
212026e8f5 Merge pull request #6084 from devhell/mpv 
mpv: 0.7.2 -> 0.7.3; waf: 1.8.1 -> 1.8.5
 2015-02-01 18:04:54 +00:00
Thomas Tuegel
95829c8959 k3b: propagate cdrecord dependency 
By default, k3b will use cdrkit, but that can be overriden by choosing
the original cdrtools.
 2015-02-01 10:34:30 -06:00
Thomas Tuegel
2b933f31f6 kdeApps.kmix: remove Qt 4 dependencies 2015-02-01 10:26:55 -06:00
Michael Raskin
c6dfb67059 Fresh LibreOffice 4.4 at least starts to build 2015-02-01 18:41:33 +03:00
Michael Raskin
a3008a638f Update qpdfview 2015-02-01 18:41:32 +03:00
Bjørn Forsman
b26a6e8a23 spek: new package 
spek is an accoustic spectrum analyzer. It helps analyse your audio
files by showing their spectrogram.

http://spek.cc/
 2015-02-01 15:19:41 +01:00
Edward Tjörnhammar
96d6344b13 idea updates: 
idea-{community,ultimate}: 14.0.2 -> 14.0.3
  android-studio: 1.0.2 -> 1.1.0b2
  clion: eap bump
 2015-01-31 20:50:34 +01:00
Vladimír Čunát
dbae4f109f Merge branch 'master' into staging 
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
 2015-01-31 19:34:57 +01:00
Sven Keidel
b50cabf2d4 cool-old-term: rename to cool-retro-term (close #6071) 
The project has changed its name to cool-retro-term. The project also added a
dependency that is included as a submodule. I added this dependency as a
separate expression.
 2015-01-31 19:23:45 +01:00
lethalman
59d1d46088 Merge pull request #6069 from arno01/cherrytree 
Adds a new package: cherrytree - A hierarchical note taking application
 2015-01-31 14:42:08 +01:00
Andrey Arapov
79c5029f2e flashplayer: minor update (sha256 correction) 2015-01-31 12:21:08 +01:00
Jascha Geerds
a90106eb22 Merge pull request #6065 from arno01/utox 
libtoxcore, utox, qtox, toxic: Update to the newest Dev version
 2015-01-31 11:26:14 +01:00
Andrey Arapov
522d059dc9 libtoxcore, utox, qtox, toxic: Update to the newest Dev version 2015-01-31 03:20:12 +01:00
Andrey Arapov
9f623a820d Adds a new package: cherrytree - A hierarchical note taking application 
cherrytree - A hierarchical note taking application, featuring rich text
and syntax highlighting, storing data in a single xml or sqlite file.

This commit also adds PyGtkSourceView - a Python wrapper for the GtkSourceView widget library.

Official page http://www.giuspen.com/cherrytree
 2015-01-31 02:17:00 +01:00