Merge remote branch 'upstream/master'
authorVitja Makarov <vitja.makarov@gmail.com>
Tue, 18 Jan 2011 19:38:27 +0000 (22:38 +0300)
committerVitja Makarov <vitja.makarov@gmail.com>
Tue, 18 Jan 2011 19:38:27 +0000 (22:38 +0300)
commit30872e939a465bb6cdda29c9e2aee0d54bc33e3a
tree5b9eee1cc149865d4cc6e46cd4dac32861ef861a
parent7283b72f0f41f9716e5f09689626b50abd487585
parentd6027cb2dfd1c087859b400cf488b8549a2d00b9
Merge remote branch 'upstream/master'