Fix conflicts in last commit

Aleksander Machniak

2013-07-04 c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0

1
2
3
4
5
6
<?php
require_once 'Net/IDNA2/Exception.php';
 
class Net_IDNA2_Exception_Nameprep extends Net_IDNA2_Exception
{
}