commit | 067f0c4e20e98949dbca59599824fa053892c38d | [log] [tgz] |
---|---|---|
author | Markus Unterwaditzer <markus@unterwaditzer.net> | Wed Mar 11 21:32:16 2015 +0100 |
committer | Markus Unterwaditzer <markus@unterwaditzer.net> | Wed Mar 11 21:32:16 2015 +0100 |
tree | 40f768191de59cc2a73841c53885999edc669ddc | |
parent | cf43b5c6069d03e62100b26a432af4e7ec70f24c [diff] | |
parent | a1f76f92a182e3afbd7e9d221cf7ece8b89649a6 [diff] |
Merge branch '2.7-maintenance'