Merge remote-tracking branch 'origin/fixes-patcito'
authorDavid A. Cuadrado <krawek@gmail.com>
Tue, 28 Feb 2012 06:55:23 +0000 (01:55 -0500)
committerDavid A. Cuadrado <krawek@gmail.com>
Tue, 28 Feb 2012 06:55:23 +0000 (01:55 -0500)
commit779e4d9a6a6d5f5d0cce78577df4dd78fb4ddaa7
treee30d5c92882d0b78ee433cc16cbbaa02a93bd23c
parent78ba9f71b52fcd2caa24dc78098c7f6589984b30
parent5aac6929a42e3483e5508e656ae7126babe046e7
Merge remote-tracking branch 'origin/fixes-patcito'

Conflicts:
app/models/group.rb
Gemfile
Gemfile.lock
app/models/group.rb
app/models/invoices/shapado_version.rb