| commit | 5d91e256e9f0acfc77127a423f4d4d713737aaf9 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Mon, 29 Jul 2013 12:33:14 +0000 (29 14:33 +0200) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Mon, 29 Jul 2013 12:54:39 +0000 (29 14:54 +0200) | ||
| tree | a16b8ff4bc60ed15af1f813bf070e3dc5d1d50f5 | treesnapshot (tar.gz zip) |
| parent | 556d69cc240df7eae7e385f87f6d33d7210b8d97 | commitdiff |
| parent | 8ed929e84d58e819cf00b5eaa2159ee9a23a96ab | commitdiff |
Merge branch 'abortmerge'
(fixes issue #1829)
Signed-off-by: Sven Strickroth <email@cs-ware.de>
(fixes issue #1829)
Signed-off-by: Sven Strickroth <email@cs-ware.de>