tree 6a896a7213d2360e9f2ec6e703ce0cb99dd4df06
parent f47c7f31ce16449045ed542ac7abf8003525d985
parent 58d16d1531c42861b6c79647a045fd9a3371eeb1
author Patrick Mueller <pmuellr@yahoo.com> 1299924768 -0500
committer Patrick Mueller <pmuellr@yahoo.com> 1299924768 -0500

Merge branch 'release-1.2.0' into develop