Merge branch '2.0'
authorThomas Schmidt <tschmidt@suse.de>
Wed, 16 Feb 2011 15:06:07 +0000 (16:06 +0100)
committerThomas Schmidt <tschmidt@suse.de>
Wed, 16 Feb 2011 15:06:07 +0000 (16:06 +0100)
commit711367b934f7cdb2849ce3338f6ba3aa2ff20820
tree6cd90ecfb63d0a3c381e6e74b56f2722c3a4b1e2
parent75d2141cd7850799b8d2b99d58df0ab108e5ed67
parent5b4adecb2a1be3791bb085ee6eb96da5cee3926c
Merge branch '2.0'

Conflicts:
app/views/ideas/main/index.html.erb