Merge branch 'device' into develop
authorPaul Brossier <piem@piem.org>
Fri, 22 Mar 2013 17:15:46 +0000 (12:15 -0500)
committerPaul Brossier <piem@piem.org>
Fri, 22 Mar 2013 17:15:46 +0000 (12:15 -0500)
commit5d1618518207664aee4cd48ebad7967885db625e
treebe82d9281700d79f0be2abb5a94698167f3678e2
parent6ff6d18ce7790aa8adc8889923f13eafc8414ab6
parent18a378eef755e01d6f5907dde97a4b272110b4f4
Merge branch 'device' into develop