Merge remote branch 'pletisan/master'
commita66bea20583aca4b9444eaf73e77dd28e563d0f9
authorScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:33:14 +0000 (28 10:33 -0700)
committerScott Chacon <schacon@gmail.com>
Fri, 28 May 2010 17:33:14 +0000 (28 10:33 -0700)
tree90e48d2009f221ca8586c610bf96314abe65901e
parentc456c7eb925172d504404722c1d98d94648f5b40
parentb0434f3e44b8bc233255ec8a85bd4bb7a22e9046
Merge remote branch 'pletisan/master'