Merge branch 'master' into crash_fixes
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 11 Jan 2013 17:44:47 +0000 (18:44 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 11 Jan 2013 17:44:47 +0000 (18:44 +0100)
commit7f881d17121a69d3ee4dacc6d50d464c0ad9db04
tree7163c7b198e4f6aa1ed558d39a69bd45fbfd2ffc
parent840c842f03158a2ec5c2f9af9f076ccd702acabb
parent05d053beaedd459de7b84f651cd7bc2be093c18e
Merge branch 'master' into crash_fixes