Merge remote-tracking branch 'stevee/fixes'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 24 Jun 2014 09:57:45 +0000 (11:57 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 24 Jun 2014 09:57:45 +0000 (11:57 +0200)
commitfb94cc5aa70004a58571281e0e3c7f398ec3207a
treec84cde02cb027d447e6bea19a68a8b25248e1b72
parent580f98e85801dc71d559743784d8f036ffcf0a2d
parentb2b05ef364b9b6cec97af2cd14d3dd64f4841478
Merge remote-tracking branch 'stevee/fixes'