]> git.zerfleddert.de Git - proxmark3-svn/log
proxmark3-svn
9 years agoULEV1_48 had the wrong max block
marshmellow42 [Wed, 20 May 2015 18:22:26 +0000 (14:22 -0400)]
ULEV1_48 had the wrong max block

9 years agominor adjustments to hf mfu
marshmellow42 [Wed, 20 May 2015 18:17:43 +0000 (14:17 -0400)]
minor adjustments to hf mfu

9 years agoAdd NTAG i2c and bug fix
marshmellow42 [Wed, 20 May 2015 18:06:46 +0000 (14:06 -0400)]
Add NTAG i2c and bug fix

also streamlined select tag code

9 years agoCHG: the new NTAG_i2c_1K enums, broke the uint16_t size.. Had to go up one level.
iceman1001 [Wed, 20 May 2015 17:26:11 +0000 (19:26 +0200)]
CHG:  the new NTAG_i2c_1K enums, broke the uint16_t size..  Had to go up one level.

9 years agoCHG: @marshmellows changes.
iceman1001 [Wed, 20 May 2015 17:20:26 +0000 (19:20 +0200)]
CHG: @marshmellows changes.
ADD: NTAG i2c 1K / NTAG i2c 2K identification.

9 years agoAdd ntag 210, 212, 203 and bug fix
marshmellow42 [Wed, 20 May 2015 15:27:44 +0000 (11:27 -0400)]
Add ntag 210, 212, 203 and bug fix

9 years agoADD: NTAG_210, NTAG_212 support / identification. @marshmellow42 's idea.
iceman1001 [Wed, 20 May 2015 12:09:40 +0000 (14:09 +0200)]
ADD:  NTAG_210, NTAG_212 support / identification.  @marshmellow42 's idea.

9 years agoCHG: "hf mfu info" now always tries to read the NDEF CC. (was restricted to only...
iceman1001 [Wed, 20 May 2015 08:36:55 +0000 (10:36 +0200)]
CHG:  "hf mfu info" now always tries to read the NDEF CC.  (was restricted to only NTAG213,215,216 before)

9 years agoFIX: comment out a #include to reveng (my experiment)
iceman1001 [Tue, 19 May 2015 19:45:06 +0000 (21:45 +0200)]
FIX: comment out a #include to reveng (my experiment)
ADD: Started to add a NTAG203 identification.   Its a hard tag to pinpoint. Doesn't have GET_VERSION,

9 years agomissed file in previous commit...
marshmellow42 [Tue, 19 May 2015 19:03:35 +0000 (15:03 -0400)]
missed file in previous commit...

duh...

9 years ago@Marshmellow42 's fixes for bigbuf.
iceman1001 [Tue, 19 May 2015 16:46:38 +0000 (18:46 +0200)]
@Marshmellow42 's fixes for bigbuf.

9 years agohf mfu dump - bigbuf allocation fix
marshmellow42 [Tue, 19 May 2015 15:30:50 +0000 (11:30 -0400)]
hf mfu dump - bigbuf allocation fix

some larger nfc tags can get large so set the allocation to the 4k
CARD_MEMORY_SIZE buffersize.

9 years agoCHG: the device-side code for "hf 14a sim x"
iceman1001 [Tue, 19 May 2015 06:56:53 +0000 (08:56 +0200)]
CHG: the device-side code for  "hf 14a sim x"
BUG: bcc1 xored error fix in "hf mf sim"
CHG: function rename Snoop -> Sniff.

9 years ago@iceman1001 s comments/updates mfu cmds
marshmellow42 [Tue, 19 May 2015 02:07:11 +0000 (22:07 -0400)]
@iceman1001 s comments/updates mfu cmds

9 years ago@Marshmellow42 's cleanup isn device-side "hf mfu" code. Looks nice. Dump uses...
iceman1001 [Mon, 18 May 2015 18:58:33 +0000 (20:58 +0200)]
@Marshmellow42 's cleanup isn device-side "hf mfu" code.  Looks nice.  Dump uses bigbuffer now, and can dump NTAG216 :)

Consistency on the client-side code "hf mfu".  looks nice.

9 years agoMF ultralight code cleanup
marshmellow42 [Mon, 18 May 2015 17:11:00 +0000 (13:11 -0400)]
MF ultralight code cleanup

9 years agoIceman1001 s MFU clean up
marshmellow42 [Mon, 18 May 2015 00:49:25 +0000 (20:49 -0400)]
Iceman1001 s MFU clean up

cleaned up MF UL_C auth code device side.

9 years agoCHG: the name change from "HF 14A SNOOP" -> "HF 14A SNIFF"
iceman1001 [Sat, 16 May 2015 13:37:27 +0000 (15:37 +0200)]
CHG:  the name change from "HF 14A SNOOP" -> "HF 14A SNIFF"

9 years agoADD: experimantal test of adding "reveng 1.30" source code into the PM3 Client.
iceman1001 [Sat, 16 May 2015 13:36:40 +0000 (15:36 +0200)]
ADD:   experimantal test of adding "reveng 1.30" source code into the PM3 Client.

9 years agoCHG: the "HF MFU" authentication changes.
iceman1001 [Sat, 16 May 2015 13:34:01 +0000 (15:34 +0200)]
CHG: the "HF MFU" authentication changes.
CHG: name change from "hf 14a snoop"  ->  "hf 14a sniff"..

9 years agochg: for the "hf mfu" authentication changes.
iceman1001 [Sat, 16 May 2015 13:32:43 +0000 (15:32 +0200)]
chg:  for the "hf mfu" authentication changes.

9 years agochg: @marshmellows changes to "hf 14a reader"
iceman1001 [Sat, 16 May 2015 13:30:17 +0000 (15:30 +0200)]
chg: @marshmellows changes to "hf 14a reader"
add: the experimental "hf 14a sim x" attack impl.
chg: sorry, but I never liked that sniffing was called snooping in this command. So I changed it to "sniff".

9 years agoadd: @marshmellow changes,
iceman1001 [Sat, 16 May 2015 13:27:53 +0000 (15:27 +0200)]
add: @marshmellow changes,
chg: remade the authentication for ULC..

9 years agomfu info / dump attempt at missing auths
marshmellow42 [Sat, 16 May 2015 05:00:31 +0000 (01:00 -0400)]
mfu info / dump attempt at missing auths

NOT TESTED.  will test soon.  probably has bugs!

9 years agomfu dump - beginning of additions
marshmellow42 [Fri, 15 May 2015 05:19:58 +0000 (01:19 -0400)]
mfu dump - beginning of additions

9 years agohf mfu dump testing
marshmellow42 [Fri, 15 May 2015 04:57:51 +0000 (00:57 -0400)]
hf mfu dump testing

9 years ago@iceman1001 s default keys
marshmellow42 [Fri, 15 May 2015 02:55:18 +0000 (22:55 -0400)]
@iceman1001 s default keys

9 years ago@iceman1001 's updated lualibs
marshmellow42 [Thu, 14 May 2015 01:36:20 +0000 (21:36 -0400)]
@iceman1001 's updated lualibs

9 years ago@iceman1001 updated scripts
marshmellow42 [Thu, 14 May 2015 01:20:23 +0000 (21:20 -0400)]
@iceman1001 updated scripts

9 years agoscripting updates from @iceman1001
marshmellow42 [Thu, 14 May 2015 01:14:35 +0000 (21:14 -0400)]
scripting updates from @iceman1001

it compiles but i'm not sure how to fully test it...
:)

9 years agoADD: @marshmellows fixes
iceman1001 [Wed, 13 May 2015 18:16:18 +0000 (20:16 +0200)]
ADD: @marshmellows fixes

9 years agominor hf mfu info adjustment from @iceman1001
marshmellow42 [Wed, 13 May 2015 15:22:27 +0000 (11:22 -0400)]
minor hf mfu info adjustment from @iceman1001

9 years ago@iceman1001 s coverity scan fixes
marshmellow42 [Wed, 13 May 2015 15:14:17 +0000 (11:14 -0400)]
@iceman1001 s coverity scan fixes

9 years agovarious bug fixes
marshmellow42 [Wed, 13 May 2015 15:07:47 +0000 (11:07 -0400)]
various bug fixes

9 years ago@marshmellow42 ideas
iceman1001 [Wed, 13 May 2015 13:48:32 +0000 (15:48 +0200)]
@marshmellow42 ideas
FIX: removed some unneeded calls to ul_switch_off_field.
FIX: once again the OTP is printed nevertheless if its a NDEF CC

9 years agoBUGS: more Coverity scan fixes.
iceman1001 [Wed, 13 May 2015 12:08:59 +0000 (14:08 +0200)]
BUGS:  more Coverity scan fixes.

9 years agoBUGS: Coverty Scan, fixes some memory bugs
iceman1001 [Wed, 13 May 2015 11:23:53 +0000 (13:23 +0200)]
BUGS:  Coverty Scan, fixes some memory bugs

9 years agominor code clean up
iceman1001 [Wed, 13 May 2015 07:18:37 +0000 (09:18 +0200)]
minor code clean up

9 years agoa minor clean up when printing the key
iceman1001 [Wed, 13 May 2015 07:15:53 +0000 (09:15 +0200)]
a minor clean up when printing the key

9 years agoAdded @marshmellow42 "hf search"
iceman1001 [Wed, 13 May 2015 07:13:42 +0000 (09:13 +0200)]
Added @marshmellow42 "hf search"

9 years agoADD: preparation for @marshmellow42 "hf search"
iceman1001 [Wed, 13 May 2015 07:10:47 +0000 (09:10 +0200)]
ADD: preparation for @marshmellow42 "hf search"
FIX: the "hf list" had not correct spaces between the lines, in my version. Fix now.

9 years agominor textual changes
iceman1001 [Wed, 13 May 2015 07:07:47 +0000 (09:07 +0200)]
minor textual changes

9 years agoMinor clean ups
iceman1001 [Wed, 13 May 2015 07:06:47 +0000 (09:06 +0200)]
Minor clean ups

9 years agoanother key..
iceman1001 [Wed, 13 May 2015 07:05:21 +0000 (09:05 +0200)]
another key..

9 years agohf mfu info - ICEMANS updates
marshmellow42 [Tue, 12 May 2015 22:16:55 +0000 (18:16 -0400)]
hf mfu info - ICEMANS updates

plus slight change to UL_EV1 auth annotation.

9 years agoHF Search - refactoring cmds to work with it
marshmellow42 [Tue, 12 May 2015 20:45:48 +0000 (16:45 -0400)]
HF Search  -  refactoring cmds to work with it

9 years agoADD: Print the key for ULEV1/NTAG authentication if sent in cmdhf.c "HF LIST 14A"
iceman1001 [Tue, 12 May 2015 18:27:45 +0000 (20:27 +0200)]
ADD:  Print the key for ULEV1/NTAG authentication if sent in cmdhf.c "HF LIST 14A"

9 years agoADD: found a BCARD KeyB on the net. ref: http://irq5.io/2013/04/13/decoding-bcard...
iceman1001 [Tue, 12 May 2015 17:50:47 +0000 (19:50 +0200)]
ADD:  found a BCARD KeyB on the net. ref: http://irq5.io/2013/04/13/decoding-bcard-conference-badges/

9 years agoFIX: increased the limit to 0xE6 for MIFARE_ULEV1_FASTREAD
iceman1001 [Tue, 12 May 2015 16:57:47 +0000 (18:57 +0200)]
FIX:  increased the limit to 0xE6 for MIFARE_ULEV1_FASTREAD
ADD: @marshmellows inital "hf search" command...

9 years agoADD: added option to call "hf mfu info" with a authentication key.
iceman1001 [Tue, 12 May 2015 16:55:34 +0000 (18:55 +0200)]
ADD: added option to call "hf mfu info" with a authentication key.
ADD: added a help text for "hf mfu info"   usage_hf_mfu_info
ADD: added @marshmellows changes & fixes.

9 years agohf search - prelim - re-use hf mfu GetTagType...
marshmellow42 [Tue, 12 May 2015 04:19:44 +0000 (00:19 -0400)]
hf search - prelim - re-use hf mfu GetTagType...

in hf 14a reader to identify UL(+)

still a work in progress.

9 years agohf mfu info bugs
marshmellow42 [Mon, 11 May 2015 22:22:50 +0000 (18:22 -0400)]
hf mfu info bugs

9 years agominor hf mfu output consistancies
marshmellow42 [Mon, 11 May 2015 20:25:11 +0000 (16:25 -0400)]
minor hf mfu output consistancies

9 years agohf mfu info - ICEMANS bug fixes.
marshmellow42 [Mon, 11 May 2015 19:56:12 +0000 (15:56 -0400)]
hf mfu info - ICEMANS bug fixes.

9 years agohf mfu info bug fixes
marshmellow42 [Mon, 11 May 2015 18:49:37 +0000 (14:49 -0400)]
hf mfu info bug fixes

9 years agoCHG: minor textual changes, consistency...
iceman1001 [Mon, 11 May 2015 18:38:13 +0000 (20:38 +0200)]
CHG: minor textual changes,  consistency...

9 years agoADD: added a List parameter to tnp3clone.lua script.
iceman1001 [Mon, 11 May 2015 17:38:53 +0000 (19:38 +0200)]
ADD:  added a List parameter to tnp3clone.lua script.

9 years agoADD: another default key: VIGIK1
iceman1001 [Mon, 11 May 2015 17:37:44 +0000 (19:37 +0200)]
ADD:  another default key: VIGIK1

9 years agoBUG: Read the wrong page(2) as Capability container, should be 3.
iceman1001 [Mon, 11 May 2015 13:54:02 +0000 (15:54 +0200)]
BUG:  Read the wrong page(2) as Capability container,  should be 3.
BUG:  NTAG 215 identification was wrong (!=)  should been (==)

9 years agominor adjustments to mfu info
marshmellow42 [Fri, 8 May 2015 17:01:27 +0000 (13:01 -0400)]
minor adjustments to mfu info

9 years agofurther MFU info updates (mainly icemans)
marshmellow42 [Thu, 7 May 2015 02:15:41 +0000 (22:15 -0400)]
further MFU info updates (mainly icemans)

9 years agoADD: added the new magic detection, where we send a partial ISO14443A_CMD_WRITEBLOC...
iceman1001 [Wed, 6 May 2015 21:50:31 +0000 (23:50 +0200)]
ADD:  added the new magic detection,  where we send a partial ISO14443A_CMD_WRITEBLOCK (0xA0) command to page 0. if the tag answer 0xA ACK (its magic) or if it answers 0x00 NACK its not.
The normal behavior for a tag is to send NACK.

9 years agoCHG: clearing a char array before using.
iceman1001 [Wed, 6 May 2015 20:41:40 +0000 (22:41 +0200)]
CHG:  clearing a char array before using.

9 years agoCHG: extracted the UL_C & UL magic tests.
iceman1001 [Wed, 6 May 2015 20:40:46 +0000 (22:40 +0200)]
CHG: extracted the UL_C & UL magic tests.
ADD: a raw write command also there.
CHG: "hf mfu info" got some more love,  looks better too.
      UL_EV1 / NTAG,  only try known passwords if AUTHLIM is set to 0.

9 years agoMFU adj to allow 0 len returns on raw cmds
marshmellow42 [Wed, 6 May 2015 14:17:39 +0000 (10:17 -0400)]
MFU adj to allow 0 len returns on raw cmds

9 years agoMFU adjustment to allow 0 len returns from raw cmds
marshmellow42 [Wed, 6 May 2015 14:16:31 +0000 (10:16 -0400)]
MFU adjustment to allow 0 len returns from raw cmds

9 years agoMFU info adjustments
marshmellow42 [Wed, 6 May 2015 13:27:03 +0000 (09:27 -0400)]
MFU info adjustments

9 years agoCHG: @marshmellows changes to anntations.
iceman1001 [Wed, 6 May 2015 12:20:24 +0000 (14:20 +0200)]
CHG: @marshmellows changes to anntations.

9 years agoADD: UL-EV1 signature printing.
iceman1001 [Wed, 6 May 2015 12:19:23 +0000 (14:19 +0200)]
ADD:  UL-EV1 signature printing.
CHG: @marshmellows changes.

9 years agoFIX: nasty bug when memcpy structs..
iceman1001 [Wed, 6 May 2015 07:30:48 +0000 (09:30 +0200)]
FIX: nasty bug when memcpy structs..
ADD: @piwi's  topaz commands

9 years agoMFU - Icemans further improvements
marshmellow42 [Wed, 6 May 2015 04:55:29 +0000 (00:55 -0400)]
MFU - Icemans further improvements

add UL-C device side read card with authentication
add MF_UL-Annotations
add ntag, and more ul descriptions in hf mfu info

9 years agoCHG: "HF MFU INFO" extracted more printstatements
iceman1001 [Tue, 5 May 2015 21:26:05 +0000 (23:26 +0200)]
CHG:  "HF MFU INFO" extracted more printstatements

9 years agoADD: "HF MFU INFO" Reading and printing of UL-EV1 configuration pages.
iceman1001 [Tue, 5 May 2015 21:14:55 +0000 (23:14 +0200)]
ADD:  "HF MFU INFO" Reading and printing of UL-EV1 configuration pages.

9 years agoCHG: making sure no buffer overflows will occure in ul_send_cmd_raw by adding respon...
iceman1001 [Tue, 5 May 2015 20:15:02 +0000 (22:15 +0200)]
CHG:  making sure no buffer overflows will occure in ul_send_cmd_raw by adding responseLength parameter to all calls.
CHG: added UL-C configurations details to be printed

9 years agoBUG: missing %s in printing version tagtype. Thanks @Marshmellow!
iceman1001 [Tue, 5 May 2015 11:25:54 +0000 (13:25 +0200)]
BUG: missing %s  in printing version tagtype.  Thanks @Marshmellow!
BUG: buffer overflow when reading the Capability Container.   Thanks @Marshmellow!

9 years agochg: minor spelling change from MIFARE_ULEV1_VERS -> MIFARE_ULEV1_VERSION
iceman1001 [Mon, 4 May 2015 22:37:13 +0000 (00:37 +0200)]
chg: minor spelling change from MIFARE_ULEV1_VERS -> MIFARE_ULEV1_VERSION

9 years agoCHG: reverted a method declaration.
iceman1001 [Mon, 4 May 2015 22:35:56 +0000 (00:35 +0200)]
CHG:  reverted a method declaration.

9 years agoCHG: for the 2k3des changes
iceman1001 [Mon, 4 May 2015 22:34:20 +0000 (00:34 +0200)]
CHG:  for the 2k3des changes

9 years agoCHG: added 2k3des to ULC READCARD.
iceman1001 [Mon, 4 May 2015 22:33:07 +0000 (00:33 +0200)]
CHG: added 2k3des to ULC READCARD.

9 years agoADD: @holimans changes.
iceman1001 [Mon, 4 May 2015 22:31:02 +0000 (00:31 +0200)]
ADD: @holimans changes.

9 years agoCHG: minor spelling
iceman1001 [Mon, 4 May 2015 22:27:34 +0000 (00:27 +0200)]
CHG: minor spelling

9 years agoADD: @marshmellows changes
iceman1001 [Mon, 4 May 2015 22:26:17 +0000 (00:26 +0200)]
ADD:  @marshmellows changes

9 years agoCHG: enhanced the "hf mfu info" a lot. It can detect UL/UL-C/UL-EV1/NTAG213/NTAG215...
iceman1001 [Mon, 4 May 2015 22:25:10 +0000 (00:25 +0200)]
CHG: enhanced the "hf mfu info" a lot.  It can detect UL/UL-C/UL-EV1/NTAG213/NTAG215/NTAG216
     and at present it can detect if a UL-C tag is magic (uid changeable)

FOR UL it writes the first configuration pages 0-3.
For UL_C  it tests some default 3des keys,  and lock / confg bytes at pages 42-43,44-47
For UL_EV1  / NTAG  it collects the GETVERSION command and tries to read 3 counters.,  it also tries one default password of 0xFF,0xFF,0xFF,0xFF  for the EV1 /NTAG  authentication 0x1B.

FOR UL_C_MAGIC,  it tries to see if the gatherd nonces for authentication 0x1A is the same, which indicates on my tags that they are magic.

There is the @marshmellow changes to "hf mfu dump" command.

This commit needs testing, and is to be considered experimental.

9 years agoMerge remote-tracking branch 'upstream/master'
marshmellow42 [Mon, 4 May 2015 03:31:58 +0000 (23:31 -0400)]
Merge remote-tracking branch 'upstream/master'

9 years agoMFU dump UL-C with key
marshmellow42 [Mon, 4 May 2015 03:17:11 +0000 (23:17 -0400)]
MFU dump UL-C with key

adding UL-C auth and keys to dump cmd
swapped endian for input of hf mfu crdbl to match output of hf mfu info
cmd and tag info app

9 years agoFixes to issue #100
Martin Holst Swende [Sun, 3 May 2015 20:09:52 +0000 (22:09 +0200)]
Fixes to issue #100

9 years agoIcemans UL-C Auth dev side fix plus a few other ...
marshmellow42 [Sun, 3 May 2015 19:41:11 +0000 (15:41 -0400)]
Icemans UL-C Auth dev side fix plus a few other ...

... small UL fixes

9 years agoCHG: "hf mfu crdbl" help text, got at correct length 3des key.
iceman1001 [Fri, 1 May 2015 13:33:54 +0000 (15:33 +0200)]
CHG: "hf mfu crdbl" help text, got at correct length 3des key.
CHG: Added @marshmellows fixes for "hf mfu info"
CHG: moved some debug printandlog statements around.

9 years agoFIX: the HF MFU CREAD command on deviceside now can do a proper ATUTHENTICATION...
iceman1001 [Fri, 1 May 2015 13:29:19 +0000 (15:29 +0200)]
FIX:  the  HF MFU CREAD command on deviceside now can do a proper ATUTHENTICATION request with 2KEY3DES.

9 years agofix bug in mfu cauth
marshmellow42 [Thu, 30 Apr 2015 14:34:20 +0000 (10:34 -0400)]
fix bug in mfu cauth

9 years agoIceman's updates to MFU info and dump
marshmellow42 [Thu, 30 Apr 2015 13:28:43 +0000 (09:28 -0400)]
Iceman's updates to MFU info and dump

9 years agoCHG: the work in progress of making "HF MFU INFO" / "HF MFU DUMP" goes on.
iceman1001 [Thu, 30 Apr 2015 08:15:52 +0000 (10:15 +0200)]
CHG: the work in progress of making "HF MFU INFO"  / "HF MFU DUMP" goes on.
     ook @marshmellows changes and remade them a bit. TagTypeUL_t behaves like a flag-enum.
     "HF MFU DUMP" now autodetects tagtype, and the deviceside should report back proper length.

9 years agoMF Ultralight - Iceman's updates + mine
marshmellow42 [Wed, 29 Apr 2015 22:27:31 +0000 (18:27 -0400)]
MF Ultralight - Iceman's updates + mine

Beginning of Ultralight additions.
detection of Ultralight Types added
dump command now auto detects type
can authenticate Ultralight C

9 years agoCHG: re-factored the "HF MFU CAUTH" command to be simpler.
iceman1001 [Wed, 29 Apr 2015 18:24:37 +0000 (20:24 +0200)]
CHG:  re-factored the "HF MFU CAUTH" command to be simpler.
ADD:  "HF MFU INFO",  added detection of MAGIC UL-C tags and a simple loop test 5 default 3des keys.

9 years agoMerge pull request #99 from Drewgoo/patch-1
Martin Holst Swende [Wed, 29 Apr 2015 06:00:25 +0000 (08:00 +0200)]
Merge pull request #99 from Drewgoo/patch-1

Update README.txt

9 years agoUpdate README.txt 99/head
Drewgoo [Wed, 29 Apr 2015 04:47:49 +0000 (22:47 -0600)]
Update README.txt

typo

9 years agoREM: Removed the CSETUID stub. Its implemented on the client side instead.
iceman1001 [Tue, 28 Apr 2015 21:34:16 +0000 (23:34 +0200)]
REM:  Removed the CSETUID stub.  Its implemented on the client side instead.

9 years agoREM: Removed the GetVendorStr, and used the getTagInfo() instead.
iceman1001 [Tue, 28 Apr 2015 21:32:45 +0000 (23:32 +0200)]
REM:  Removed the GetVendorStr,  and used the getTagInfo() instead.

9 years agoADD: HF MFU SETUID, this commands helps changing the UID on a magic UL, UL-C...
iceman1001 [Tue, 28 Apr 2015 21:31:22 +0000 (23:31 +0200)]
ADD:  HF MFU SETUID,    this commands helps changing the UID on a magic UL, UL-C tag.
It reads block2,  since only one byte is going to change. Then it proceds to write block 0,1,2 with recalc BCC1, BCC2 bytes.

CHG:  HF MFU INFO, got some love in the form of detection of UL/UL-C/UL-EV1.  Took same idea from HF 14A READER.

9 years agoMerge pull request #98 from marshmellow42/master
Martin Holst Swende [Tue, 28 Apr 2015 21:08:28 +0000 (23:08 +0200)]
Merge pull request #98 from marshmellow42/master

Iceman's fixes for #93, #96, #97

Impressum, Datenschutz