merge release2012-02-08
authorKornilios Kourtis <kkourt@inf.ethz.ch>
Mon, 6 Feb 2012 14:31:49 +0000 (15:31 +0100)
committerKornilios Kourtis <kkourt@inf.ethz.ch>
Mon, 6 Feb 2012 14:31:49 +0000 (15:31 +0100)
commit014af5bbd516b7731a6eec6e79ac5bd640e472b0
tree4c8457572cdbfdf33758252a3b52fdd2b265fe0e
parentd9e1c4de23498d5f0a289363b79b9fe248ec7cc4
parent5474b8c37e8a320f02a0dab6589d239bc155ba89
merge