| commit | 06e2ace0b0fa3393108e7fa2b25a3d3d02d1a46e | [log] [tgz] |
|---|---|---|
| author | Olaf Bergmann <bergmann@tzi.org> | Fri Apr 22 14:59:39 2016 +0200 |
| committer | Olaf Bergmann <bergmann@tzi.org> | Fri Apr 22 14:59:39 2016 +0200 |
| tree | d47219da52e666969c032cdfbf2514aad2a0a5e0 | |
| parent | ae385945edd9abd1007edd3ec6e0c940951873c7 [diff] | |
| parent | 5d80ef902603fdbad5d7bb92eb50ee53afa2cdff [diff] |
Merge branch 'origin/develop' This merge does a cleanup of accidentally diverged histories of master and develop branch.