Jean Chalard 5930e47190 am bd4693cd: Merge "[ML27.1] Allow adding additional features to other settings"
* commit 'bd4693cd3fffcca2b73953fc05df4bc1a9b0a1bc':
  [ML27.1] Allow adding additional features to other settings
2014-10-16 11:10:33 +00:00
..
2014-10-06 16:56:32 +09:00