5.1 merge

This commit is contained in:
Sergei Golubchik 2013-01-10 13:54:04 +01:00
commit bd87fed1dc
96 changed files with 1633 additions and 1025 deletions

View file

@ -1,4 +1,5 @@
/* Copyright (c) 2006, 2011, Oracle and/or its affiliates.
Copyright (c) 2012, 2013, Monty Proram Ab.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by