MarcoFalke
4dee609e10
Rename rpcconsole.ui => debugwindow.ui
2015-09-23 10:27:39 +02:00
Diego Viola
99ee4a656b
Fix spelling of Qt
2015-09-22 05:00:10 -03:00
Wladimir J. van der Laan
229fb974ab
Merge pull request #6667
...
2eb31839be08b7
2015-09-21 18:17:48 +02:00
Wladimir J. van der Laan
ed55a1f5f9
Merge pull request #6671
...
0186228
2015-09-21 17:21:18 +02:00
Wladimir J. van der Laan
5e21388c48
Merge pull request #6695
...
ddf98d12190ea68b2d6ed5ce43da
2015-09-21 17:16:40 +02:00
Wladimir J. van der Laan
2190ea6c4e
rpc: Split option -rpctimeout into -rpcservertimeout and -rpcclienttimeout
...
The two timeouts for the server and client, are essentially different:
- In the case of the server it should be a lower value to avoid clients
clogging up connection slots
- In the case of the client it should be a high value to accomedate slow
responses from the server, for example for slow queries or when the
lock is contended
Split the options into `-rpcservertimeout` and `-rpcclienttimeout` with
respective defaults of 30 and 900.
2015-09-21 17:15:36 +02:00
MarcoFalke
2eb3183ca4
[doc] Merge doc/assets-attribution.md into contrib/debian/copyright
...
Even though the SVG source files are never used in the QT client,
their authors are mentioned in contrib/debian/copyright due to
simplicity.
2015-09-18 18:14:42 +02:00
Wladimir J. van der Laan
3802ae7267
devtools: don't push if signing fails in github-merge
...
If a problem happens with gpg, exit prematurely so that it doesn't push
the branch upstream.
2015-09-18 06:03:17 +02:00
Zak Wilcox
b0beae8b82
Drop "with minimal dependencies" from description
...
Five boost libs plus libcrypto are needed; I don't think that quite passes for minimal.
2015-09-17 10:17:24 +01:00
Zak Wilcox
5e5e00bf4c
Split bitcoin-tx into its own package
...
Reverts the change putting it in the bitcoind deb.
2015-09-17 07:23:04 +01:00
Jeff Garzik
e6a14b64d6
Add ZeroMQ support. Notify blocks and transactions via ZeroMQ
...
Continues Johnathan Corgan's work.
Publishing multipart messages
Bugfix: Add missing zmq header includes
Bugfix: Adjust build system to link ZeroMQ code for Qt binaries
2015-09-16 11:01:35 +01:00
MarcoFalke
9be08b7fe2
Update contrib/debian/copyright
2015-09-15 16:38:08 +02:00
Matt Corallo
0186228d61
Update trusted-git-root to the most recent unsigned commit
2015-09-14 12:54:25 -04:00
Holger Schinzel
c38e5233c1
fixing reference
...
Closes #603
2015-09-12 16:25:31 +02:00
UdjinM6
a31df6e4ae
fix linearization tool to make it work with Dash
2015-09-12 16:24:04 +02:00
UdjinM6
8d1609f0a5
translations 20150902
2015-09-03 00:32:34 +03:00
Kevin Cooper
d4aa54c5af
added org.bitcoin.bitcoind.plist for launchd (OS X)
2015-09-02 09:48:40 -07:00
Wladimir J. van der Laan
51fcfc022c
doc: remove documentation for rpcssl
2015-09-02 18:38:41 +02:00
Zak Wilcox
05179f7e9d
Include bitcoin-tx binary on Debian/Ubuntu
...
Currently left out of Matt's PPA. Debian's package for unstable already has it.
2015-08-29 18:52:44 +01:00
evan82
82606d6322
Merge pull request #562 from UdjinM6/v0.12.1.x_cleanup
...
V0.12.1.x cleanup
2015-08-28 20:04:48 -07:00
UdjinM6
657bd1103e
Few cleanups:
...
- compiling errors
- output
- CBitcoinAddress usage cleanup
- refresh qt project file
- fix typo in `masternode` debug category
2015-08-28 23:16:58 +03:00
UdjinM6
06c1524e89
fix update-translations.py to work correctly with % at the end of a string
2015-08-22 22:00:04 +03:00
Wladimir J. van der Laan
80cddbbba9
Merge pull request #6539
...
9f68ed6
2015-08-19 17:28:00 +02:00
UdjinM6
812cc6bbb1
let translations mix qt and printf
2015-08-15 17:32:55 +03:00
Veres Lajos
9f68ed6b6d
typofixes (found by misspell_fixer)
2015-08-10 22:06:27 +01:00
Wladimir J. van der Laan
100c9d3994
Merge pull request #6505
...
df9c2ee9142867
2015-08-07 12:57:17 +02:00
Marco
9142867572
[QT] cleanup icons
...
* Cleanup SVG code
* Unify design ("Typicons" seem to have round edges)
* Fix transparency issue with clock5.png
2015-08-04 12:06:12 +02:00
Casey Rodarmor
9f5edb970a
Removed contrib/bitrpc
...
It's unclear if people are using this and if it's worth maintaining.
2015-08-03 13:02:49 -04:00
Wladimir J. van der Laan
dcc495e011
Merge pull request #6372
...
e3c4297
2015-07-17 22:02:45 +02:00
centaur1
6d6cec3838
Create centaur1-key.pgp
2015-07-15 13:00:32 -04:00
Wladimir J. van der Laan
3f556edc61
doc: update mailing list address
...
Move from sourceforge to linux foundation.
Also get rid of some other stale mentions of sourceforge.
Github-Pull: #6319
Rebased-From: 88d8525ca2
2015-07-14 13:19:46 +03:00
Paul Georgiou
e3c42973b2
Update Linearize tool to support Windows paths
2015-07-10 19:21:21 +03:00
Florian Schmaus
8c44e63077
Add BITCOIND_SIGTERM_TIMEOUT to OpenRC init scripts
...
This allows users to specify, e.g. raise, the default timeout of 60
seconds. Some bitcoind instances, especially long running ones on slow
hardware, require a higher timeout for a clean shut down.
Also add a comment to bitcoind.openrc's 'retry=', since it is not
obvious from the variable name what it does.
2015-07-08 22:53:22 +02:00
Cory Fields
a3ba9a553a
gitian: make the windows signing process match OSX
2015-06-30 10:57:14 -04:00
UdjinM6
6363a25879
fix debian qt icon ref
2015-06-29 02:20:11 +03:00
Wladimir J. van der Laan
b9329536cd
Hardcoded seeds update June 2015
2015-06-25 08:05:52 +02:00
Wladimir J. van der Laan
884454aebe
contrib: Add port parsing to makeseeds.py
...
Allow for non-8333 nodes to appear in the internal seeds. This will
allow bitcoind to bypas a filter on 8333. This also makes it possible to
use the same tool for e.g. testnet.
As hosts with multiple nodes per IP are likely abusive, add a filter to
remove these (the ASN check will take care of them for IPv4, but not
IPv6 or onion).
2015-06-25 08:05:52 +02:00
Wladimir J. van der Laan
ccd4369a23
contrib: Improvements to hardcoded seeds scripts
...
- Moved all seed related scripts to contrib/seeds for consistency
- Updated `makeseeds.py` to handle IPv6 and onions, fix regular
expression for recent Bitcoin Core versions
- Fixed a bug in `generate-seeds.py` with regard to IPv6 parsing
2015-06-25 08:05:33 +02:00
Evan Duffield
71761f6317
Merge branch 'v0.12.0.x' of https://github.com/darkcoin/darkcoin into v0.12.0.x
2015-06-23 16:46:55 -07:00
Evan Duffield
f1b868f098
Removed PoSe due to consensus issues
...
- With nodes coming and going on the network, the network could come to different opinions about who should get paid next in line due to some nodes being flagged as failing a PoSe check. This will have to be fixed by introducing a blockchain based PoSe system, but that's out of the scope of this release. To fix the issues in the interrim, I'm removing PoSe checks for the time being.
2015-06-23 16:44:31 -07:00
Holger Schinzel
69552ea087
added gitian builds for Raspberry Pi
2015-06-23 22:10:56 +02:00
Wladimir J. van der Laan
b77fbe095f
Merge pull request #6303
...
d08cfc2
2015-06-22 16:16:48 +02:00
Wladimir J. van der Laan
88d8525ca2
doc: update mailing list address
...
Move from sourceforge to linux foundation.
Also get rid of some other stale mentions of sourceforge.
2015-06-22 09:13:19 +02:00
Cory Fields
d08cfc2bd7
gitian: add a gitian-win-signer descriptor
...
This is exactly like the current OSX signing process.
osslsigncode has been patched to detach and re-attach Windows signatures.
The changes can be seen here: https://github.com/theuni/osslsigncode/commits/attach-signature
There's a pull-request open upstream for the changes:
https://sourceforge.net/p/osslsigncode/osslsigncode/merge-requests/3/
This work has been back-ported to the stable 1.7.1 release of osslsigncode, so
that a smaller patch can be reviewed.
2015-06-18 18:17:36 -04:00
Christian Decker
82e6487af8
Adding pgp public key for cdecker as requested by @jonasschnelli in bitcoin/gitian.sigs#182
2015-06-18 17:56:37 +02:00
Cory Fields
c110575a92
gitian: Use the new bitcoin-detached-sigs git repo for OSX signatures
...
Rather than fetching a signature.tar.gz from somewhere on the net, instruct
Gitian to use a signature from a tag in the bitcoin-detached-sigs repository
which corresponds to the tag of the release being built.
This changes detached-sig-apply.sh to take a dirname rather than a tarball as
an argument, though detached-sig-create.sh still outputs a tarball for
convenience.
2015-06-10 17:54:46 -04:00
Wladimir J. van der Laan
defa4fc25c
Merge pull request #6249
...
cab580d
2015-06-09 14:21:39 +02:00
Paul Rabahy
789b7c34b8
gitian-downloader: Add prab's key
2015-06-07 22:48:29 -04:00
Peter Todd
cab580d62e
gitian: Add petertodd to gitian download scripts
2015-06-07 20:10:51 -04:00
Erik Mossberg
f053bd26a9
Add erkmos OpenPGP key to gitian downloader keyset
2015-06-04 12:05:53 +02:00
Wladimir J. van der Laan
9d67b10091
Merge pull request #6218
...
960e994be65628c3cdd7b
2015-06-03 15:22:33 +02:00
Jonas Schnelli
0a32a9347e
OSX: use "Bitcoin Core" as Bundle Display Name
2015-06-03 10:06:10 +02:00
Cory Fields
960e99404f
gitian: Bump cache dir for current master
...
Do not backport.
2015-06-02 10:41:56 -04:00
Cory Fields
be656283f9
gitian: bump faketime to something more recent
...
This helps in file views where binaries are sorted by time
2015-06-02 10:39:34 -04:00
Jonas Schnelli
a2241eabfd
[OSX] revert renaming of Bitcoin-Qt.app
2015-06-01 15:42:34 +02:00
Wladimir J. van der Laan
68aff60e4a
Merge pull request #6190
...
1fe4c4f
2015-05-27 11:51:00 +02:00
Luke Dashjr
1fe4c4fcff
gitian-downloader: Update luke-jr's key
2015-05-26 20:47:31 +00:00
Wladimir J. van der Laan
b3024f077b
Merge pull request #6168
...
7f68c7d
2015-05-22 08:17:08 +02:00
Jeff Garzik
7f68c7dc05
contrib/linearize: Support linearization of testnet blocks
2015-05-20 15:27:51 -07:00
Cory Fields
d1a3866e0b
build: Cope with spaces in filenames when creating/applying OSX sigs
2015-05-19 11:03:54 +02:00
Jonas Schnelli
7cef321e65
[Mac only] rename Bitcoin-Qt.app to "Bitcoin Core.app"
2015-05-19 11:03:49 +02:00
UdjinM6
18c60f9ecb
Merge branch 'master' into v0.12.0.x_merge_btc010_master (fix spaces)
2015-05-16 02:34:25 +03:00
sandakersmann
78f44b60d5
Capitalized P2P
...
Capitalized P2P
2015-05-14 01:02:00 -04:00
sandakersmann
8e9248d96b
[Trivial] Cryptocurrency is one word
...
Cryptocurrency was added to Oxford Dictionaries Online in May 2014.
2015-05-14 01:02:00 -04:00
Evan Duffield
9646c5ffcb
update github url
2015-05-06 13:49:49 -07:00
Evan Duffield
160eec6e30
merged
2015-05-04 02:36:23 -07:00
Evan Duffield
969826c249
Reference Node / Stubbed Out Budget System
...
- Removed of reference node and replaced with decentralized quorums that pick the masternodes who get paid each block.
- Made a budgeting system, where masternodes can vote on individual budgets and the data is stored perminently on each clients computer
2015-04-30 07:55:37 -07:00
UdjinM6
24309f78ce
various (gitian) build fixes
2015-04-29 21:27:52 +03:00
Rob Van Mieghem
89fc6b67aa
Remove leftover strlcpy.h copyright
...
src/strlcpy.h was removed by 6032e4f4e7
2015-04-20 13:29:21 +02:00
UdjinM6
fabca0a428
more bitcoin->dash fixes
2015-04-06 00:56:58 +03:00
UdjinM6
d5f7a89097
update .pro
2015-04-05 03:14:25 +03:00
UdjinM6
64eebc3316
0.12 dirty merge'n'fix (bitcoin 0.10)
2015-04-04 19:24:37 +03:00
Pieter Wuille
5ff94c630e
Add git-subtree-check.sh script
2015-04-02 17:52:52 -07:00
CohibAA
9d086c01bc
Update bitcoin.conf
2015-03-21 20:05:17 -06:00
Evan Duffield
d0e5aa8385
fixed github reference
2015-03-20 09:30:23 -07:00
Wladimir J. van der Laan
c7abfa595d
Merge pull request #5149
...
adaa568
2015-03-20 12:05:05 +01:00
Evan Duffield
5cb26c5928
Changed darkcoin references to dash
...
- Changed out logos (just a placeholder)
- DRK -> DASH
- ./darkcoin -> ./dash
2015-03-19 12:03:14 -07:00
Wladimir J. van der Laan
29fef0b903
Merge pull request #5360
...
71acb86
2015-03-18 14:35:18 +01:00
Evan Duffield
35bb210c6b
Dash rebranding
2015-03-17 16:06:58 -07:00
Wladimir J. van der Laan
f238add26a
Merge pull request #5847
...
723664b
2015-03-16 12:32:21 +01:00
Wladimir J. van der Laan
41259ca635
Merge pull request #5849
...
3c6d594
2015-03-16 12:21:33 +01:00
crowning2
fd865303f1
Added new resources to QT-Makefile
2015-03-07 01:43:42 +01:00
joshr
723664b5db
startup script for centos, with documentation.
2015-03-03 11:23:54 -05:00
Wladimir J. van der Laan
f8e68f7bfb
Merge pull request #5819
...
d23b0a23448b13c95ac830671516aa367303ee028f
2015-03-03 16:27:50 +01:00
Luke Dashjr
3c6d594e64
contrib/init/bitcoind.openrc: Compatibility with previous OpenRC init script variables
2015-03-03 09:52:21 +00:00
Ciemon
96c19a3a8e
Add bitcoin-cli man page
2015-02-26 11:07:41 +01:00
UdjinM6
30f10d97d5
fix b58 test data generation
2015-02-25 20:23:08 +03:00
Cory Fields
c95ac83e51
gitian: fix x86_64 build with static libstdc++
2015-02-23 19:43:25 -05:00
Cory Fields
06715165f9
build: change reduce exports/static libstdc++ options for gitian and travis
...
For Gitian releases:
- Windows builds remain unchanged. libstdc++ was already linked statically.
- OSX builds remain unchanged. libstdc++ is tied to the SDK and not worth
messing with.
- Linux builds now statically link libstdc++.
For Travis:
- Match the previous behavior by adding --enable-reduce-exports as
necessary.
- Use static libstdc++ for the full Linux build.
2015-02-23 18:22:58 -05:00
Wladimir J. van der Laan
aaba10f275
Revert "Make nicer pull request merge messages"
...
This reverts commit 1078fb0885#5623 ). It has various issues:
- Pull request names get cut off at ", see e.g. a026a56
2015-02-20 09:59:33 +01:00
evan82
3bb9ef96f4
Revert "Revert "Rebrand to darkcoin""
2015-02-19 11:58:38 -07:00
evan82
516f590c65
Revert "Rebrand to darkcoin"
2015-02-19 11:28:40 -07:00
Matt Corallo
544e64e975
Update debian changelog and control file
2015-02-18 13:34:33 -08:00
vertoe
a179777a0a
Rename darkcoin config header.
2015-02-16 23:19:42 +01:00
vertoe
6d60156dce
Fix darkcoin resource file.
2015-02-16 22:54:26 +01:00
vertoe
b1170309a4
Rename darkcoin resource file.
2015-02-16 22:43:16 +01:00
vertoe
91adbde525
Rename darkcoinstrings file.
2015-02-16 22:28:38 +01:00
Cory Fields
047a898317
gitian: don't add . to tar list
...
Since permissions and timestamps are changed for the sake of determinism,
. must not be added to the archive. Otherwise, tar may try to modify pwd when
extracting.
Rebased-From: 0c6ab676ee#5790
2015-02-13 09:55:11 +01:00
Cory Fields
0c6ab676ee
gitian: don't add . to tar list
...
Since permissions and timestamps are changed for the sake of determinism,
. must not be added to the archive. Otherwise, tar may try to modify pwd when
extracting.
2015-02-13 03:08:08 -05:00
Michael Ford
99437c51ba
Add fanquake PGP key
2015-02-11 21:50:24 +08:00
Wladimir J. van der Laan
f69941620b
Merge #5623 : Make nicer pull request merge messages
...
1078fb0
2015-02-09 12:53:00 +01:00
Jonas Schnelli
65f10e0ffc
fix jonasschnelli's gitian key
...
There where two keys in the keyfile and it also had a missing "-key" in the filename.
See: http://bitcoinstats.com/irc/bitcoin-dev/logs/2015/02/05#l1423162105
2015-02-06 11:13:38 +01:00
vertoe
86db4eb853
Fix project file and update translation source file.
2015-02-04 12:48:39 +01:00
vertoe
64438577e0
Prepare transifex integration.
2015-01-30 11:39:55 +01:00
Wladimir J. van der Laan
c7b22aa0ac
Merge pull request #5683
...
95ef87c48bebcc997cab788a7973
2015-01-29 09:29:32 +01:00
vertoe
18e95bd6b9
Update darkcoin-qt.desktop
2015-01-27 11:25:45 +01:00
Wladimir J. van der Laan
2511a39cca
Merge pull request #5575
...
7b782f5
2015-01-26 12:38:22 +01:00
Jonas Schnelli
95ef87c75e
add new osx dmg background picture
2015-01-20 09:33:38 +01:00
Cory Fields
48bebcca79
osx packaging: update DS_Store after background changes
2015-01-20 09:32:54 +01:00
Cory Fields
88a797320a
osx packaging: move background image to .background to match gitian builds
...
Also increase temp dmg filesize to account for a bigger background image
2015-01-20 09:32:54 +01:00
Cory Fields
f0172bf91e
osx: bump build sdk to 10.9
2015-01-20 01:49:20 -05:00
evan82
ab53ee8f63
Merge pull request #113 from UdjinM6/fix_macdeploy
...
more fixes for mac deploy
2015-01-16 13:58:43 -07:00
vertoe
c7c561cf87
merge duplicate desktop files
2015-01-16 21:29:46 +01:00
UdjinM6
3aa1e4dc18
more fixes for mac deploy
2015-01-16 23:22:14 +03:00
vertoe
0745120cfa
Fix mac osx deploy scripts.
2015-01-16 10:19:59 +01:00
vertoe
e9dc24c055
Fix icons and debian install shortcuts.
2015-01-16 09:34:26 +01:00
Wladimir J. van der Laan
d1aa3c67f0
Merge pull request #5489
...
905711f42f6a0c
2015-01-14 17:22:37 +01:00
Wladimir J. van der Laan
905711f0a1
contrib: improve optimize-pngs.py
...
- Check that image contents match pre- and post- crushing.
- Also remove use of external tool to compute sha256 in favor of hashlib.
- contrib: remove all use of shell=True in strip_pngs.py
Using `shell=True` can be a security hazard. See e.g.
https://docs.python.org/2/library/subprocess.html#subprocess.check_output
2015-01-14 17:19:04 +01:00
Jonas Schnelli
42f6a0c2b9
[Qt] optimize PNG files
...
- provide a python script
- add optimized png files
2015-01-14 17:18:48 +01:00
Jonas Schnelli
324f64d148
jonasschnelli's GPG key
2015-01-13 21:30:01 +01:00
vertoe
928613c03c
merge branch '0.9' of https://github.com/bitcoin/bitcoin into devel-0.9
2015-01-12 07:42:34 +01:00
BtcDrak
1078fb0885
Make nicer pull request merge messages
2015-01-11 09:12:40 +00:00
Wladimir J. van der Laan
b8ac476890
gitian: bump revision for OSX qt
...
Not necessary for windows or linux, as the intermedate build result
doesn't change.
However for OSX on 0.9 the builds for the intermediates are not
deterministic, so this cannot be assessed. Bump the dep version just in
case.
2015-01-10 11:48:02 +01:00
Wladimir J. van der Laan
f047dfa7df
gitian: openssl-1.0.1i.tar.gz -> openssl-1.0.1k.tar.gz
2015-01-10 08:57:25 +01:00
Pieter Wuille
58fda4d689
Update seed IPs, based on bitcoin.sipa.be crawler data
...
Rebased-From: be22b3da1d#5532
2015-01-06 11:02:50 +01:00
Pieter Wuille
be22b3da1d
Update seed IPs, based on bitcoin.sipa.be crawler data
2015-01-05 17:23:23 +01:00
Cory Fields
46f54bf796
build: osx builders no longer need 32bit compiler support
2015-01-02 15:09:43 -05:00
Evan Duffield
12bac4a862
gitian changes, tooltips and version bump
2015-01-02 09:54:13 -07:00
Cory Fields
221a38024a
dmg: fix deterministic dmg creation and docs
...
Rebased-From: 0d50c2fd81#5569
2015-01-02 17:14:34 +01:00
Darkcoin
cfba0c88d8
Merge pull request #99 from nightlydarkcoin/v0.11.0.x
...
fixed gitian builds
2015-01-02 08:55:42 -07:00
Holger Schinzel
a9c8f5f18e
fixed gitian build
2015-01-02 16:03:27 +01:00
Holger Schinzel
9fcd256482
fixed gitian builds
2015-01-02 13:42:55 +01:00
Evan Duffield
3a6403ae33
Gitian updates
2015-01-01 13:46:35 -07:00
Evan Duffield
2ad2b57c12
Fix for gitian windows compiling
2015-01-01 09:47:45 -07:00
Evan Duffield
f139b70a28
More gitian updates
2014-12-31 14:06:20 -07:00
Evan Duffield
cbdf23070f
update gitian descriptors
2014-12-31 12:03:18 -07:00
Evan Duffield
cf92651fc4
More gitian updates
2014-12-31 09:49:12 -07:00
Evan Duffield
cf7a304dfd
Update gitian descriptors
2014-12-31 09:10:49 -07:00
Luke Dashjr
7b782f5b01
RPCWallet: Notate all account stuff as deprecated
2014-12-30 14:46:57 +00:00
Cory Fields
0d50c2fd81
dmg: fix deterministic dmg creation and docs
2014-12-30 02:47:38 -05:00
Cory Fields
b3d67e1c34
gitian: attempt to fix tarball determinisim
...
Rebased-From: 566c6cb8a2#5536
2014-12-27 04:56:14 +01:00
vertoe
bdaa900bbe
Update strings in UI.
2014-12-27 00:16:50 +01:00
Cory Fields
566c6cb8a2
gitian: attempt to fix tarball determinisim
2014-12-23 19:43:27 -05:00
Wladimir J. van der Laan
39c809942d
contrib: make github-merge require signing
...
- Exit when there is no signing key configured
- Exit when user does not want to sign off
2014-12-20 13:58:51 +01:00
Matt Corallo
adaa568722
Add script to verify all merge commits are signed
2014-12-20 00:39:42 -05:00
sandakersmann
f914f1a746
Added "Core" to copyright headers
...
Github-Pull: #5494
Rebased-From: 15de949bb9277e442302bdd8dee299a8d6deee60
2014-12-19 19:55:32 +01:00
Michael Ford
78253fcbad
Remove references to X11 licence
2014-12-16 15:56:50 +08:00
Wladimir J. van der Laan
3bb29a3e13
Merge pull request #5440
...
ebdd6bf8d174d6
2014-12-11 16:33:27 +01:00
UdjinM6
80c4636840
fix test_bitcoin -> test_darkcoin
2014-12-11 14:20:10 +01:00
Wladimir J. van der Laan
6e6a36ce30
contrib: show pull # in prompt for github-merge script
2014-12-09 10:16:58 +01:00
