Rebase against 6d323d81b2a604b89c612928a573b290c945df75.

This commit is contained in:
Sebastian Lackner
2015-05-11 18:10:47 +02:00
parent d3dbcb9165
commit 5215a311fe
4 changed files with 113 additions and 153 deletions