Merge remote branch 'origin/master'master
commit716ba4b360a7a2ec3c5d3b1833600fdf33004d3d
authorDoug Semler <dougsemler@gmail.com>
Thu, 6 May 2010 03:31:07 +0000 (5 23:31 -0400)
committerDoug Semler <dougsemler@gmail.com>
Thu, 6 May 2010 03:31:07 +0000 (5 23:31 -0400)
tree8777a8ed0e335128af6ed3d6a4c3e60089f5dc70
parent4a89707040a29efbe52044b9c114f8d94a05e954
parent067321f4346f9ce1c20e0cbdfe8bcf2ef2ef3f95
Merge remote branch 'origin/master'

* origin/master:
  daily update