Merge branch 'ticket11'
authoradam <adamansky@gmail.com>
Fri, 14 Dec 2012 17:34:05 +0000 (00:34 +0700)
committeradam <adamansky@gmail.com>
Fri, 14 Dec 2012 17:34:05 +0000 (00:34 +0700)
commit53d1567318f6084731136ae43de81294c8a009b4
tree4e34abab5d10a5a04854e9726eda3ffd125021ed
parent9f35449191bcf5f95233e94e102366d1b8ae1a4b
parent918def721549f052d28c2bd61b763b3a95da5331
Merge branch 'ticket11'