Merge branch '0.8.18-beta1' into 0.8.18-beta2

This commit is contained in:
ailin-nemui 2016-01-12 23:34:44 +01:00
commit 38b1121989
4 changed files with 10 additions and 6 deletions

View file

@ -77,7 +77,7 @@ Other patches (grep for "patch" in ChangeLog) by:
Jon Mayo
Johan Kiviniemi
JasonX
Lukas Mai
Lukas Mai (mauke)
Ismael Luceno
Thomas Karpiniec
Svante Kvarnström
@ -95,6 +95,5 @@ Other patches (grep for "patch" in ChangeLog) by:
Adam-
Robert C Jensen
Paul Johnson
mauke
KindOne
Fabian Kurz