[crux-commits] ports/opt (3.1): Merge branch '3.1' into 3.2

commit f346ca53a4580fc896a3d1443cb219d2e60a9960 Merge: f88f71a 3355cce Author: Fredrik Rinnestam <fredrik@crux.nu> Date: Tue Jun 30 00:20:39 2015 +0200 Merge branch '3.1' into 3.2