Merge remote branch 'michalt/master'
commitc8bd70d86a505da7f1cc9439c50350776a5ef235
authorScott Chacon <schacon@gmail.com>
Mon, 14 Dec 2009 20:30:33 +0000 (14 12:30 -0800)
committerScott Chacon <schacon@gmail.com>
Mon, 14 Dec 2009 20:30:33 +0000 (14 12:30 -0800)
treea3be5d9292141b6c9955e59a8e0d6547e0b7ac5a
parent20664eca955cd2396f25dd265b70c34a5775dfce
parent9869532c1d3435e3270bbd0b24c3019a2c5aa81f
Merge remote branch 'michalt/master'