chiark / gitweb /
Merge branch 'new-settings' into devel
authorYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:28:45 +0000 (16:28 -0400)
committerYouness Alaoui <kakaroto@kakaroto.homelinux.net>
Fri, 31 Jul 2015 20:28:45 +0000 (16:28 -0400)
commit804c942bd617f6559475839501cfd7b18ad57dc4
treeea518c966ff250162f26f91189bbcd4faa37147d
parent707526252f6dccca50e7c7f193003ce7a1f42096
parentd4183ffdffc9ea9d3c4a267426720d5693269cbe
Merge branch 'new-settings' into devel

This merges a few missed commits