Merge remote-tracking branch 'upstream/develop' into 1503-faster-tags

This commit is contained in:
Michael Vogel 2015-03-08 03:23:49 +01:00
commit 08696acb18
2 changed files with 7195 additions and 7012 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff