From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 23 Apr 2013 08:12:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'stevee/ntp-fix'
X-Git-Tag: pango~231
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3c8feabab81c77fdace9ee9019ccfce07e5bd050;p=people%2Fstevee%2Fipfire-3.x.git

Merge remote-tracking branch 'stevee/ntp-fix'
---

3c8feabab81c77fdace9ee9019ccfce07e5bd050