Merge branch 'master' into staging.

2015-01-19 18:41:17 +01:00
parent a0bf07827b d957d9e6bc
commit ec6b82a0c2
184 changed files with 9526 additions and 3808 deletions
@@ -108,6 +108,7 @@
  manveru = "Michael Fellinger <m.fellinger@gmail.com>";
  marcweber = "Marc Weber <marco-oweber@gmx.de>";
  matejc = "Matej Cotman <cotman.matej@gmail.com>";
+  matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
  meditans = "Carlo Nucera <meditans@gmail.com>";
  meisternu = "Matt Miemiec <meister@krutt.org>";
  michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";