Merge remote-tracking branch 'upstream/master' into super-admin
Merge remote-tracking branch 'upstream/master' into super-admin
update Twitter Bootstrap
Merge remote-tracking branch 'upstream/master' into super-admin
Update Twtiter Bootstrap :D
use memcached gem

memcache-client is already deprecated
https://github.com/mperham/memcache-client#memcache-client-is-deprecated-as-of-august-2010--it-will-be-supported-through-2010-but-new-code-should-use-dalli-instead
if can not connect memcached, skip memcache with memcached server tests
if can not connect redis, skip redis with redis server tests
divide skip cause for Mongo test

- cause 1 : Mongo lib LoadError
- cause 2 : can not connect to Mongo server
Forcing the mysql gem to stay in 2.8.x since 2.9 is out and break things
for existing users.
Use a simpler syntax to refer to Padrino edge on Github in the Gemfile
`gem 'padrino', github: 'padrino/padrino-framework'`. It reads so much
better :)
Support 1.8.7 :)
skip redis test of redis not available
Merge branch 'bash0C7-skip-padrino-cache-test-if-can-not-connect-to-cache-server'

Conflicts:
	padrino-cache/test/test_stores.rb
update CHANGES
Merge remote-tracking branch 'upstream/master' into super-admin

* upstream/master:
  update CHANGES
  skip redis test of redis not available
  divide skip cause for Mongo test
  if can not connect redis, skip redis with redis server tests
  if can not connect memcached, skip memcache with memcached server tests
  use memcached gem
Added a parent variable to a route so that it tells who its parent
controller was (if any).

If it doesn't have a parent it will be nil.

See motivation here:
https://github.com/dariocravero/padrino-autobind-parent-example
Added tests
Merge pull request #1093 from padrino/use-mysql-2.8.1

Forcing the mysql gem to stay in 2.8.x.
Merge pull request #1094 from padrino/gemfile-tweak

Use a simpler syntax to refer to Padrino edge on Github in the Gemfile