Hiro Asari 9265ac62c9 Merge branch 'master' into ha-feature-remove_log_endpoint ... Conflicts: Gemfile.lock travis-api.gemspec		2014-06-17 09:05:05 -04:00
..
tasks	Update encryption task	2013-08-15 13:46:05 +02:00
travis/api	Merge branch 'master' into ha-feature-remove_log_endpoint	2014-06-17 09:05:05 -04:00