merge of '6c01f570946b5aa15076b2de30882e3812c7e889' v2.5.3a
authorJosep Puigdemont <josep.puigdemont@gmail.com>
Sat, 20 Dec 2008 18:45:53 +0000 (18:45 +0000)
committerJosep Puigdemont <josep.puigdemont@gmail.com>
Sat, 20 Dec 2008 18:45:53 +0000 (18:45 +0000)
commitfb0acb02a62f70cb251d53734e4062f8ffb6ad08
tree552cfa05c6a4484040af6672535f239f97a92a58
parent792001645d2c514fb31d0d0433277eae4133b0a3
parentc83f49c7a14f5c96b66d52c92efcb037b8aa5544
Merge ... '6c01f570946b5aa15076b2de30882e3812c7e889'
     and 'fa50c4742d2c18d82e4cf12732c5640f35d7b7af'