Merge branch 'prefs-less-globals'
commit5832c4b64c293e6091cf4da555b59d7931b13cb9
authorColomban Wendling <ban@herbesfolles.org>
Sun, 10 Aug 2014 14:28:56 +0000 (10 16:28 +0200)
committerColomban Wendling <ban@herbesfolles.org>
Sun, 10 Aug 2014 14:28:56 +0000 (10 16:28 +0200)
tree81150eb5cddb980a33efd3d45838604ff20aec8e
parenta8a6ef7d131e49e1cc5ed843ebec3167fd7b018b
parent2559cda95408bd8b32a96baff1918a78ce649c75
Merge branch 'prefs-less-globals'