Merge branch 'proposed'
authorLuca Filipozzi <lfilipoz@emyr.net>
Mon, 27 Jan 2014 04:25:46 +0000 (04:25 +0000)
committerLuca Filipozzi <lfilipoz@emyr.net>
Mon, 27 Jan 2014 04:26:01 +0000 (04:26 +0000)
commitf1d1d77ca9e36a1559a3639a3beac60c603fc9be
tree1a211b1ee41766fadac7b028213082536c5a9b85
parente58a19ebaf2e526f67c9923dedb335841f0ccb55
parent56782ec1a950492b2ef041fc69c9777af5f6a62d
Merge branch 'proposed'
Signed-off-by: Luca Filipozzi <lfilipoz@emyr.net>