Merge remote branch 'immerda/master'
authorintrigeri <intrigeri@boum.org>
Fri, 25 Feb 2011 23:25:57 +0000 (00:25 +0100)
committerintrigeri <intrigeri@boum.org>
Fri, 25 Feb 2011 23:25:57 +0000 (00:25 +0100)
commit0b709ed5a7acb5964970e2f49153bd47fc9a7301
tree0ddc1b182904f3074a4cec121910c445daa2f5bd
parent5d7667b8d00cc3fc6cfa75a0413076db1dd0cff8
parent7e7eb1d652a97b73e09c26c5c04e21e80d8706ab
Merge remote branch 'immerda/master'