Merge branch 'master' into rails3.1

Oleg committed May 24, 2011
commit 36df63e9bbc05abacd7b1e38a927d464ec4a5fab
Showing 0 changed files with 0 additions and 0 deletions