Merge branch 'genete_device_settings'
authorCarlos Lopez <genetita@gmail.com>
Fri, 12 Mar 2010 17:10:33 +0000 (18:10 +0100)
committerCarlos Lopez <genetita@gmail.com>
Fri, 12 Mar 2010 17:10:33 +0000 (18:10 +0100)
commit9047a65b015ec9d7eb093b74229680b76f88564a
tree9b09819f93402bd7b7bd27e7a3d6a13e80d92f60
parentd142890f6a23f6736747978763468faa7581aab0
parent66d124c5d5756ce20d62586dde685459d10a0f55
Merge branch 'genete_device_settings'