From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Apr 2013 13:16:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'tebert/nano'
X-Git-Tag: pango~243
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7d14079dae8b1043b874561d407dc5d07c24a2a;p=people%2Fstevee%2Fipfire-3.x.git

Merge remote-tracking branch 'tebert/nano'
---

e7d14079dae8b1043b874561d407dc5d07c24a2a