commit c4edb13e2486d0d06bad2e626fa16b85ba1e1da6 Merge: 32db277 e1f176c Author: Juergen Daubert <jue@jue.li> Date: Mon Sep 28 16:08:16 2015 +0200 Merge branch '3.1' into 3.2 Conflicts: wpa_supplicant/.md5sum wpa_supplicant/Pkgfile