Merge remote-tracking branch 'upstream/master' into pm3+reveng
authormarshmellow42 <marshmellowrf@gmail.com>
Mon, 29 Jun 2015 04:06:59 +0000 (00:06 -0400)
committermarshmellow42 <marshmellowrf@gmail.com>
Mon, 29 Jun 2015 04:06:59 +0000 (00:06 -0400)
commitbf7ebb7b208a3b95f28a9a40f2e560a56e121794
treeddf3f15aa23592c9ffd772d51ea825522997e70f
parentc3dca45114828d70ab02792af5121831f7014c50
parent86ed606758bb547cee6fbca00e1e8986c120266f
Merge remote-tracking branch 'upstream/master' into pm3+reveng

Conflicts:
client/Makefile
client/Makefile
Impressum, Datenschutz