tree c15effad1b61f8b7c3ddb1e1c3f277f1bd899875
parent 14641089aa8ad8f9c17886c3ecf534868a282431
parent 5c4a6877e47d08982dad6608c54141f5fc69ae87
author Seth Falcon <seth@opscode.com> 1349807939 -0700
committer Seth Falcon <seth@opscode.com> 1349807939 -0700

Merge remote-tracking branch 'origin/kas/unfubar'