Merge branch 'maintenance-webyast-1.0' into tmp/lslezak/bnc_607684
authorLadislav Slezak <lslezak@novell.com>
Thu, 24 Jun 2010 13:48:55 +0000 (15:48 +0200)
committerLadislav Slezak <lslezak@novell.com>
Thu, 24 Jun 2010 13:48:55 +0000 (15:48 +0200)
commit5450c9b56fccc7c68aa41c69b58ec319243c990a
tree7e61b7048aebfc549a45e90ace9eea701a60a210
parent6cd98b18124a9ad9eb802bf5fcf89333a9fea5ef
parentb0132f60f53d798779a1370ad5fecd80d58063d4
Merge branch 'maintenance-webyast-1.0' into tmp/lslezak/bnc_607684
plugins/patches/app/models/resolvable.rb