]> source.dussan.org Git - vaadin-framework.git/commit
Merge commit '375f73'
authorJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 12:34:01 +0000 (15:34 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Mon, 11 Jun 2012 12:34:01 +0000 (15:34 +0300)
commit3b5b81a8ce6fa0e3cd7b90739649264eb6eb5580
treec668a0ddc4048cf90ef11cc6c6d260aaa6c4cb92
parent0cfc68526f984f32a56fbb6ea5390642c5da31c7
parent375f737133f4852559bf9b841fd27bc31795975e
Merge commit '375f73'

Conflicts:
tests/test.xml