Merge pull request #1 from brianmcgillion/master
authorjarkkos <jarkko.sakkinen@iki.fi>
Fri, 11 Nov 2011 14:01:58 +0000 (06:01 -0800)
committerjarkkos <jarkko.sakkinen@iki.fi>
Fri, 11 Nov 2011 14:01:58 +0000 (06:01 -0800)
commit368288d0aee323ed532162b123623f900131e3e4
tree3802059ee5d3bd4a95ba112385a021219d8bf4b1
parentb58c5e116dee936c77b7df8794a925d6b622dcf2
parentd93b825680f585c6baf07c9ff406f895b95aa2d1
Merge pull request #1 from brianmcgillion/master

Commits as agreed