Merge pull request #152 from bassamtabbara/master
authorGonzalo Paniagua Javier <gonzalo.mono@gmail.com>
Mon, 8 Aug 2011 13:25:59 +0000 (06:25 -0700)
committerGonzalo Paniagua Javier <gonzalo.mono@gmail.com>
Mon, 8 Aug 2011 13:25:59 +0000 (06:25 -0700)
commit154bc389d5e72ee2dc099b87dcd2be1a6b6f2836
tree34e0070758a8705746666f212d080e7c801734d2
parenta6fda915203418c3c534b470bd54f9981669fad4
parentf012d0b3441f7c9b8e64aa7917675d992af4deb0
Merge pull request #152 from bassamtabbara/master

Some fixes to master