Merged updates from trunk into stable branch
[feedcatcher.git] / vendor / rails / activerecord / test / assets / flowers.jpg
vendor/rails/activerecord/test/assets/flowers.jpg