Merge remote-tracking branch 'upstream/master'
authormarshmellow42 <marshmellowrf@gmail.com>
Tue, 13 Jan 2015 21:02:23 +0000 (16:02 -0500)
committermarshmellow42 <marshmellowrf@gmail.com>
Tue, 13 Jan 2015 21:02:23 +0000 (16:02 -0500)
Conflicts:
client/cmdlf.c

1  2 
client/cmddata.c

Simple merge
Impressum, Datenschutz