Merge branch 'master' into qt
authorEd Page <eopage@byu.net>
Wed, 1 Dec 2010 03:03:21 +0000 (21:03 -0600)
committerEd Page <eopage@byu.net>
Wed, 1 Dec 2010 03:03:21 +0000 (21:03 -0600)
commitbec3e07019d2142d39702df9f4dcb2d21bafdee5
treefd71379f745f975964b3ca1569aea67d6c69fa2c
parent331cd058bcb886676f6f27a043d98cfb8d124d29
parentb3a0285fe9b55764fb01b6b3fd3705f430b37277
Merge branch 'master' into qt
src/backends/gvoice/gvoice.py