summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/git
diff options
context:
space:
mode:
authortv <tv@shackspace.de>2015-10-17 14:01:47 +0200
committertv <tv@shackspace.de>2015-10-17 14:01:47 +0200
commit8cfdca6b6d6eed24953c1259b11239260e5a849f (patch)
tree3f4fda4dc9dfdf9e1bba864c45a45d0bfd310167 /makefu/2configs/git
parent4d32e1575705e544c8cbb5834447d71c1b577970 (diff)
parentf83b3770dd401004bef0233c3de0eb07686788a5 (diff)
parentfb945f741d709ec198cbf534ad0da2c623abac76 (diff)
Merge remote-tracking branches 'pnp/master' and 'mors/master'