Merge branch 'Garkin' into garkin-part

Author Sasky <sky42ks@gmail.com>
Author date 2014-06-21 12:30:12
Author local date 2014-06-21 05:30:12 -0700
Committer Sasky <sky42ks@gmail.com>
Committer date 2014-06-21 12:30:12
Committer local date 2014-06-21 05:30:12 -0700
Commit b3fe00314048d741af2973c2be2396fca213bc94
Tree d95e8d5f3556adfa14dd79c01252268e94d9a66f
Parent 556106a1526fe7f6ef881ee1af3f7a9279c0aafb
Parent 2942f56e4b2f47dd124f4a42047bec12f2489c5b
Merge branch 'Garkin' into garkin-part