Merge remote-tracking branch 'origin/master' into ui-kuadrosx
authorJorge H. Cuadrado <kuadrosxx@gmail.com>
Fri, 5 Aug 2011 20:15:47 +0000 (15:15 -0500)
committerJorge H. Cuadrado <kuadrosxx@gmail.com>
Fri, 5 Aug 2011 20:15:47 +0000 (15:15 -0500)
commit544a9e1b99111f16caf419fbfdbd557e2a4b36a6
tree14a828c2824b36bb6ba01598a6562775b0ced317
parent05ea50acb9a36a72ca792ac542e1b4b1e7b36c0a
parentf222af3a9c0704a4e89b95199c1895f6a0ff6ffb
Merge remote-tracking branch 'origin/master' into ui-kuadrosx

Conflicts:
app/models/widgets/pages_widget.rb
app/models/widgets/pages_widget.rb