Merge commit '2edc86107c9be1f1d5ab8bb4d9e8903250e02938'
authorBruno Friedmann <bruno@ioda-net.ch>
Mon, 21 May 2012 19:57:05 +0000 (21:57 +0200)
committerBruno Friedmann <bruno@ioda-net.ch>
Mon, 21 May 2012 19:57:05 +0000 (21:57 +0200)
commit64df8e70e745a0b922a9d149691232c0adbbc1af
treebd3b4cbfbd2a18e47e0d50a43377371786f95264
parent62693442f5e63fabea4e9f5e2ec66528f8c695d2
parent2edc86107c9be1f1d5ab8bb4d9e8903250e02938
Merge commit '2edc86107c9be1f1d5ab8bb4d9e8903250e02938'