| commit | b19ea53252b4daaa4f160c78882b2d81f94051f7 | [log] [tgz] |
|---|---|---|
| author | Sebastian Schuberth <sschuberth@gmail.com> | Thu Aug 18 16:07:16 2016 +0200 |
| committer | Sebastian Schuberth <sschuberth@gmail.com> | Thu Aug 18 16:08:24 2016 +0200 |
| tree | 079ccbac09329ca96a5f1919452b2098c9bc68f6 | |
| parent | a9d392f12b93757f41afc84ee3c54a1a15698d32 [diff] | |
| parent | bec722532c80eb1b6ba5a6c430ba73ba8c4a9280 [diff] |
Merge branch 'stable-2.11' into stable-2.12 Change-Id: If287eb5c7d3f5b43ec513d7696f94cf430d832fe