Merge remote branch 'cniekel/master'
commitcb0a23336286ce290cf543c918454ec4d2e556a6
authorScott Chacon <schacon@gmail.com>
Thu, 7 Jan 2010 04:10:06 +0000 (6 20:10 -0800)
committerScott Chacon <schacon@gmail.com>
Thu, 7 Jan 2010 04:10:06 +0000 (6 20:10 -0800)
tree34f2a3cffa258fa0456128fd517e63d48bec639f
parent1304c1fb948de120518d49f78ab502f5622f8c5d
parentdd7d2a195ec37bbc0bd7a8e67ac14dae19872543
Merge remote branch 'cniekel/master'