Merge branch 'release-1.2.0' 1.2.0
authorPatrick Mueller <pmuellr@yahoo.com>
Sat, 12 Mar 2011 10:12:04 +0000 (05:12 -0500)
committerPatrick Mueller <pmuellr@yahoo.com>
Sat, 12 Mar 2011 10:12:04 +0000 (05:12 -0500)
commit9fef782c63ac9fdf6300c413540f99aba820254f
tree6a896a7213d2360e9f2ec6e703ce0cb99dd4df06
parent3a0b077bf9e2bebab4d86bc59f8124a6247a90d7
parent58d16d1531c42861b6c79647a045fd9a3371eeb1
Merge branch 'release-1.2.0'