gistfile1.sh

khelll@khelll-laptop:~/projects/merb-book$ git rebase mattetti/master
book-content/ar/toc.markdown: needs update                           
gems/bin/autospec: needs update                                      
gems/bin/edit_json.rb: needs update                                  
gems/bin/erubis: needs update                                        
gems/bin/gpgen: needs update                                         
gems/bin/maruku: needs update                                        
gems/bin/marutex: needs update                                       
gems/bin/merb: needs update
gems/bin/mongrel_rails: needs update
gems/bin/rackup: needs update
gems/bin/rake: needs update
gems/bin/rake2thor: needs update
gems/bin/spec: needs update
gems/bin/thor: needs update
gems/gems/fastthread-1.0.1/ext/fastthread/Makefile: needs update
gems/gems/fastthread-1.0.1/ext/fastthread/fastthread.o: needs update
gems/gems/mongrel-1.1.5/ext/http11/Makefile: needs update
gems/gems/mongrel-1.1.5/ext/http11/http11.o: needs update
gems/gems/mongrel-1.1.5/ext/http11/http11_parser.o: needs update
gems/gems/mongrel-1.1.5/ext/http11/mkmf.log: needs update
gems/gems/nokogiri-1.0.6/ext/nokogiri/mkmf.log: needs update
public/stylesheets/master.css: needs update
khelll@khelll-laptop:~/projects/merb-book$