![](https://secure.gravatar.com/avatar/df8330968b6df8cd1c1942c5fb4b720c.jpg?s=120&d=mm&r=g)
18 Nov
2015
18 Nov
'15
7:42 p.m.
commit 3a4a6d5cb33860995a4b3b64491c25bd816191df Merge: 02f3f88 5e71c79 Author: Juergen Daubert <jue@jue.li> Date: Wed Nov 4 12:34:21 2015 +0100 Merge branch '3.1' into 3.2 Conflicts: firefox/.footprint firefox/Pkgfile