tree 02b8cce1e191d2dc439bd6261b3a5f4a17fd0df4
parent ab20939c69901654b04618c8dde8113d86c3829a
parent 4b39dee9c768ea25789dd5afeb06a944bdb5a002
author Patrick Mueller <pmuellr@yahoo.com> 1302009953 -0400
committer Patrick Mueller <pmuellr@yahoo.com> 1302009953 -0400

Merge branch 'release/1.3.0' into develop