merged master
authordaniel <daniel.kinzler@wikimedia.de>
Mon, 25 Jun 2012 11:43:00 +0000 (13:43 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Mon, 25 Jun 2012 11:43:00 +0000 (13:43 +0200)
commitf5b2f09ab0dd5c2d4a1e7d1fbdf7ab069b10ce28
tree777344ac4a6480b0cd7d4fa261f852a693327667
parentb0fd13578ed6a9bd54023035dd4fa0aa3bd5fab1
parent7f45e77396a0e63004f1bade11d1de817c2412a1
merged master

Change-Id: I0323bdbc035962a6ac8f9473df8a6b72acf82b4c