Merge branch 'development' master
authorLuciano Montanaro <mikelima@cirulla.net>
Sat, 4 Jan 2014 15:45:19 +0000 (16:45 +0100)
committerLuciano Montanaro <mikelima@cirulla.net>
Sat, 4 Jan 2014 15:45:19 +0000 (16:45 +0100)
commit809498945af9cfaf47a37a611ba255cb6b621d81
treeed89060dcd7be41cda6bedea22b8305c8ac5e7a8
parent7b3aac8b9dcc4a347dbdbb8bfaf1d8074330d6dd
parent780b618d76ae72cccc05b4cfa769654c08534fa0
Merge branch 'development'