merge 1.0.x back into trunk

This commit is contained in:
Thialfihar
2010-06-30 19:59:33 +00:00
parent 933ec4f7b6
commit 16cea885e2
45 changed files with 21 additions and 32 deletions

View File

@@ -12,7 +12,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Author: 359 <359@siol.com>
-->