summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-11-07 10:38:27 +0100
committertv <tv@shackspace.de>2015-11-07 10:38:27 +0100
commitbbcdef021a9197ff4b6ae597600b649b9a7b998b (patch)
treea664485eab3aec0c3d3f8e9d7c23bd49a2c816d6
parenta3f6dcb75ce73f57e1053054cf70667c2daef22d (diff)
parent0c71d4261973ce5c68a08d75c18a1f9a4dadecc9 (diff)
parent288324507c03548286f37e1810cebb22813b8001 (diff)
Merge remote-tracking branches 'mors/master' and 'pnp/master'