Merge branch 'fixes-kuadrosx' into fixes-patcito
authorPatrick Aljord <patcito@gmail.com>
Sat, 6 Aug 2011 00:00:17 +0000 (19:00 -0500)
committerPatrick Aljord <patcito@gmail.com>
Sat, 6 Aug 2011 00:00:17 +0000 (19:00 -0500)
commit880c05208c5a02225fb8ccb01faf3e24010275c5
tree59b4a8a51187e1bb30aa514ddcecac4936c96ebb
parent4dd10209447e8ae7ec8685c4846367a971a57ac2
parent3fc949b2199a607c1f722c9dc6b4c62350719bc9
Merge branch 'fixes-kuadrosx' into fixes-patcito

Conflicts:
app/views/widgets/_widget.html.haml
app/views/widgets/_widget.html.haml