chiark / gitweb /
Merge remote-tracking branch 'origin/new-settings' into new-settings
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:28:13 +0000 (16:28 -0400)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:28:13 +0000 (16:28 -0400)
commitd4183ffdffc9ea9d3c4a267426720d5693269cbe
tree28c467ca8685cb0cc44528854c4a9fdf310e1461
parent39e76cab17f7167f51023b42a03761f9b4eca9b7
parent08152fa46d1f6da87e2f0d0a7431370047b6f69d
Merge remote-tracking branch 'origin/new-settings' into new-settings