Merge branch 'master' into udev
authorJonas Ådahl <jadahl@gmail.com>
Tue, 19 Nov 2013 21:29:38 +0000 (22:29 +0100)
committerJonas Ådahl <jadahl@gmail.com>
Tue, 19 Nov 2013 21:29:38 +0000 (22:29 +0100)
commit97a277a9f09ad7ce5dd86649bc1e93240e94c6cd
treefa227049db815d2e346151287134b34bc8307f16
parentfacf1dd2645147630b29e20262534f06f5d04343
parent3450e49c867e6f00db49f9093df75909147cce97
Merge branch 'master' into udev