diff options
| author | makefu <github@syntax-fehler.de> | 2016-02-15 17:07:48 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-02-15 17:07:48 +0100 |
| commit | 3ceff0ec29a36119ea83f02c8943752d91b250e9 (patch) | |
| tree | 7b179bc972ea01c9305ea64697e14237346885d8 | |
| parent | 9a4071b66ff45e99a30e9a314eb43c6efc7e921f (diff) | |
| parent | 372f2d77f301719e396a6f943657325e2f8b2cf4 (diff) | |
Merge remote-tracking branch 'cd/master'