labofsahil/github-event-dataset-2012 huggingface dataset:
MFC r226216 (by das):
  Pass -std= flags in CFLAGS to mkdep. Without this, preprocessor tests
  for particular compiler features might be evaluated differently by
  mkdep than they would be by cc.

MFC r226244 (by das):
  Also pass the -ansi flag through to mkdep (requested by bde), and fix
  a cut-and-paste-o (noticed by rdivacky).

MFC r239613:
  Make sure bsd.dep.mk does not filter out -stdlib=xxx from CXXFLAGS,
  since this determines parts of the C++ include path.
Hide DIR definition by making it an opaque struct typedef.

Introduce dirfd() libc exported symbol replacing macro with same name,
preserve _dirfd() macro for internal use.

Replace dirp->dd_fd with dirfd() call. Avoid using dirfd as variable
name to prevent shadowing global symbol.

Sponsored by:	Google Summer Of Code 2011
MFC r238601

On BIO_ERROR, set bio_resid to stop losing data in the error case.

Submitted by: Mark Johnston <markjdb@gmail.com>
MFC r240508, r240516, r240519 (gabor):

 Update stable/8/release/doc files post-XML conversion.
 This commit fixes most of the 8-STABLE release build problems.

NOTE:  stable/8 release notes are still broken with this commit, and
should be fixed with the commits that follow.
Close colspec tags to conform to XML standards.
This commit should fix more 8-STABLE release build problems.

This is a direct commit to stable/8.
Convert installation article to XML stanards.

This is a direct commit to stable/8.
Revert previous commit...

Pointyhat to:	gjb (myself)
- When interrupt is not requested for VM86 call, make a fake exit point and
push the address onto stack as we do for INTn emulation.  This avoids stack
underflow when we encounter RETF instruction in VM86 mode.  Lack of this
exit point actually caused page fault in VM86 mode with VESA module when we
resume from suspend state[1].
- Remove unnecessary CLI and STI instructions from BIOS interrupt emulation.
INTn and IRET must be able to emulate the flag correctly.

Reported by:	gavin [1]
Tested by:	gavin (early revision)
MFC after:	3 days
TinyBSD now seems to be hosted elsewhere.
lo recorre concurso
Implement specs for `env:set`.
Extract common setup from env specs.
Extract duplication from env tasks into a method.
Block number is now correctly decoded from the coinbase of a share for the web view.
Get default version for candidate from mongo.
pulling tables
Fixed mistake in modelname
Setup routes for posts, homepage and strategies
Added bootstrap to layout
solve I
link to documentations.
Release 12.03.0!
rain
rain
rain
rain
rain
rain
rain
rain
rain
rain
rain
cursors shenaningans
typespec - a format for python3 function annotations
Separate making of rus, anglish and Vestnik tex files from single lyx->tex output
Определения и примеры устранимых/неустранимых нулей
wyzerowanie
commit na masterze
add test for the bitmap.mask and change to use the easeljs-NEXT-min.js
add some test for the matrix
added a users controller
Trying to update the CSS again
Create depot.php
Finished up docs in README for now.
Check game and invitation interval changes
Merge pull request #9 from gcs272/master

Remove django-twilio
Modified the powerpoint to finish the teachercom registration

All powerpoints except the presentation should be up to date
make calls work! yay!
add BASE_URL to message sending
add BASE_URL directive to install.sh
manual merge of command
Fix calling gm input show incorrectly.

Also put check around terminal size query.
make available version 2.3.2 of varscan
New tool for extracting sample variants with annotation from VCF
Cosmetic update to SummarizeBuilds
Merge branch 'master' of ssh://git/srv/git/genome
Added geo files
Correct the variable type
Space
Wording
Quick implementation of the plain mode, most useful in CI environments
Merge pull request #40 from gerhard/plain-mode

Quick implementation of the plain mode, most useful in CI environments
This is how easy it is to create a new deliver strategy.
You can do it locally, specific to your project.
Ensure awk only matches the "url =" lines
SUPERVISOR only makes sense for strategies that use it.
Not a big fan of duplication, but in this case it's the most
straightfoward approach.
PHP apps need the ownership concept since they're served via PHP which
will most definitely run under a different user (php-fpm, www-data) etc,
Joining ownership & permissions
Escapes, explicit success since && can result in a non-zero return
Changelog update
A more suitable name...
Merge pull request #41 from gerhard/php-strategy

Deliver PHP code (or just a static site) to a shared environment.
Merge branch 'master' into zero-downtime
Fix for array values such as AUTHORIZED_REMOTE_HOSTS
Some useful links
Tiny guard for when the app is not using rvm. If an .rvmrc file is not
present locally, it won't bother sourcing it in production. You should
deliver from the branch that you're intending to push out. You should
version .rvmrc files in the app, do not generate them on the remote
hosts.
Merge pull request #42 from gerhard/no-rvm-guard

Tiny guard for when the app is not using rvm.
Don't assume all environments are production when bundling gems.
Merge branch 'master' into zero-downtime
adding post adding final 3
Exposed linear and angular factor methods for PhysicsRigidBody; modified lua bindings to match.
Added Linux 32-bit libs and encoder
Merge pull request #522 from seanpaultaylor/next

Added Linux 32-bit libs and encoder
Merge pull request #521 from pooerh/7cb4da33e9fe55606d632f387439fa30a26b7c0f

Exposed linearFactor and angularFactor from Bullet to PhysicsRigidBody
Saving Linux 32-bit for gameplay-encoder
Merge pull request #523 from seanpaultaylor/next

Saving Linux 32-bit for gameplay-encoder
adding comma in one translation, makes more sense
404, license, adsense, contact details page
Using speakerdeck instead of slideshare
Added user registration app
Bumped Valet's version to v0.0.2
Bumped the README to v0.0.2
Updated the CHANGELOG for v0.0.2
Merge branch 'release-0.0.2' into development
Set version to 1.6.2
Merge branch 'release/gitools-1.6.2' into develop
some more fixes for column iterator.
Adding finish notes to SDK docs.
Added some more files to ignore
Fix awful hack for scrollback color against dark background
Port is finished
Tiny polishing
New invisible status in enum
Merge branch 'master' of github.com:gorthauer/vkkit
Remove some remnants of the emitter thread code that has been moved to a
minion. Refs PRGBPD-71.
Added support for (uncommited) DB settings.
QML UI Bugfixes for the 3.1.1 N9 release
codetools: identifier completion: added mode directives

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@37287 4005530d-fff6-0310-9dd1-cebe43e6787f
SynEdit: more support for combining codepoints

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@39095 4005530d-fff6-0310-9dd1-cebe43e6787f
IDE: clean ide on clean common files

git-svn-id: http://svn.freepascal.org/svn/lazarus/trunk@36449 4005530d-fff6-0310-9dd1-cebe43e6787f
cn: improve path detection
fix completely broken vdeductions logic
fix command usage notices
Update to current versions of gem dependencies
Add jruby support
GRIFFON-570 add production URL to where usage tats get posted
renamed password digest error msg
Screen prototypes.
Added stuff.

Change-Id: Icd8cc89b9da924b7d846ef7ec2ead11ce44e6649
Updated

Change-Id: Ia53b1f370fc3ec7e09dedb17147e71fc379fd6be
New

Change-Id: I3736015c085f2d22a0b35fd1b2dbb90fc0239f67
Add missing initialization of set_.
doc: use '-' instead of '_' as separator for labels
test: update the value of distance field

refs #1389
test: re-generate expected files with updated geo_distance.csv data

refs #1389
Remove -e echo option because it's not portable
Update footers.
Added Bing Maps API option to geocoding function.
added all localdups to file for co-anno
Show confirm dialog before deleting alerts in console
Move reference to singletons into the onStart() method
Chagning the way constants are added. Adding methods to add stay constraints depending on the move direction.
haliluya
move browserid signin to header
found bug. now everything should work.
Updated winner page to use track template
Modified for testing purposes
Added support for ARM_ERRATA_754322 & ARM_ERRATA_754327
initial rigol ds series summary
Import rtsSupportsBoundThreads unsafe
Use #{const WSANOTINITIALISED} instead of hard-coding the constant
Network.Socket: factor out setNonBlockIfNeeded
Add throwSocketErrorCode, and use it in connect and accept

This fixes "no error" error messages on Windows when using these functions.
Updated docs of density to reflect changes
+ ‘SparkleShare (Hylke Bons, Apr 18 15h04) copy 4 (copy) copy.txt’
Converting more functions to the new arg-checking system.
foxyproxy: replace fb rule with ninjagameden
dactyl: switch to the 6th tab with <C-6>
fx: remove telemetry prompt setting

Fx14 doesn't accept an integer here.
decor: undecor pandyland comic
modif file master colors
Aliases: gcac, gcoc to commit 'Cleanup.'
Fix to limit
Mention normalizing of mixed line endings
Dynamic reg exp rules support
Dynamic StringDetect rules support
Dynamic DetectChar
hooked up HOP data feeder to wordle. Not sure why sometimse the wordle's draw() method takes a long time to run
Fix a parse error in the composer.json file.
U format (in zFormat) understands classname.

Then (:foo:U:) with foo set to aaa\bbb\ccc will produce Aaa\Bbb\Ccc.
Reformat indent.
Reimplement the pgp_pin_cmd function for OpenGPG card.
HORNETQ-1057 - remove redistributor from queueImpl properly
Merge pull request #591 from andytaylor/master

HORNETQ-1057 - remove redistributor from queueImpl properly
The refactoring I did mistakenly renamed a comment. So I'm reverting that here.
And since I'm committing something here anyways, I used this time to do some little cleanup on TODOs
Merge pull request #619 from clebertsuconic/master

cleanup only
Fix: duplicate end tag and missing form parts
Merge remote-tracking branch 'dolibarr/3.1' into 3.1
Doc
Minor change
Use Cabal to build sample apps
- Enable syntax highlighting for older Emacsen that have it off
- Making Buffer Names Unique
Added moinmoin mode for editing MoinMoin Wiki.
Use MELPA to instead of Marmalade package repo.
Move Folder to Trunk

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@2 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
added d3forum_r revision 70 sources

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@3 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
added d3pipes module of reduced adoption of Legacy_Utils::createBlockProcedure from domifara's version.

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@4 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
fixed miss package of d3pipes by naao

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@5 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
2.1.8になってしまっているので一旦trunkの下を消します。竹原

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@6 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
2.2.0コアをアップロード。竹原

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@7 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
2.2.0コアをアップロード。竹原

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@8 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
2.2.0コアをアップロード。竹原

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@9 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
2.2.0コアをアップロード。竹原

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@10 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
2.2.1コアをマージ。竹原

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@11 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
Added Altsys-L into extra_module folder

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@12 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
Added d3forum and d3pipes modules

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@13 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
commit missed uploaded d3forum html files

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@14 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
move Altsys to html and trust directory

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@15 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
move Altsys to html and trust directory

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@16 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc


git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@17 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
upload d3forum agein

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@18 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
upload d3forum agein

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@19 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
Theme and Multimenu

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@20 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
Add pico rev14

git-svn-id: https://svn.sourceforge.jp/svnroot/xoopscube22x/trunk@21 4dba175d-8fb6-45ee-ba88-c0098d4d2fdc
modified Card to correctly store pin instance, added whatspace to Charge
update upgrade docs
新增单元测试部分，junit.
All core files for setup
compare pickled version of SGObject instances not just ptrs
fix vw makefile
fix a couple of issues like in applications

most notably the SVM object is gone and replaced by KernelMachine
only import modshogun
comment print functions in examples
Merge branch 'master' of git://github.com/shogun-toolbox/shogun
Merge branch 'master' of github.com:iglesias/shogun
* compile errors fixed, features issue pending
+ getters for covs and means, ~ scaling and rotations to private
Merge branch 'qda'
Added README.md to gh-pages
Removed a call to call_user_func_array

call_user_func_array can be not performant, so changed to a direct call instead
Merge remote-tracking branch 'lavoiesl/patch-1'

* lavoiesl/patch-1:
  Removed a call to call_user_func_array
prepare demo SPL
Merge branch 'master' of https://github.com/pkarasev3/kslice
remove nginx restart
Fix question2 of lab6
Clean up question 1 lab 6
Remove lab5 for now needs to be cleaned up
adding bashrc and update profile
Delete NimbusKit files & add as submodule instead.
fix a memory leak
Merge branch 'master' of https://github.com/inlined/GetWell
Another of README
add creator.rb
moving immutable stats to bottom of admin pane. closes #33
Added lambda option to the property method
Added a check for from options, same name will cause a StackTooDeep error
Added :transform_with option
Updated readme
Merge pull request #44 from fabn/trash-proc

Trash property options to transform values using proc or lambdas
Removed fragments and dynamic imports. Added centralized control of the maven-bundle-plugin.
Renabled duplicate detection
* missing stage1 in the manual
further work on user manual
Update jsbattle.js
Fix %env magic on Python 3.

Closes gh-1201
Merge pull request #1602 from takluyver/i1201

Fix %env magic on Python 3 and add simple test.

Closes gh-1201.
Moved newBoard declaration elsewhere.

Added functions to convert from dom nodes to underlying model and vice versa.  Tested both.
Add Erla trait
Adding yajl2 backend.
Removing unused references from yajl backend.
Defaulting to python backend in `ijson` for now.
Reducing the size of the produced image, and make it more readable.
SPHINX_DIR should use the mkdir function
minor efficiencies
Key Callback, Mouse Callback
Fixed a date parsing bug when including a timezone.
fixed thumbnail + star position
renamed articles to $articles
More motion
Catalog view completed
Add tests for std::list
in_array was looking for the exact string, but the name seem to be only
a subset of the characters in the value

Change-Id: Ia686e171bd248eda1d4d19b9be6107cbaedf0655
Fixed typo

Change-Id: I77daec9412a232b649e29f01453a1580e30cf6c6
Fixed unit tests

Change-Id: Ieb3dc981dcedb0c8211347ac58d44bf1d8fd6856
Added dev dependencies to run without zf2 in include path (with --dev)

Change-Id: I7fa81b621bc2f93e1caf756f5c3d21b48f5b137d
[jmdb] Building ibx
[jmdb] Reverting dependency management
[jmdb] Updating jars
Protects $name with htmlspecialchars in register.phtml
Rewrites paypal.inc
Checks if user is identified before processing $_POST in nodecomment
Merges izend/master
Move NotifyQuit in JackServer::Stop.
Refactoring and separating form mixins
Fixing dialog z-index issue
Updating includes for new file mixin structure
Misc changes to form styling
Improving link colours
Updating ctrl reference in footer
Misc styling changes
update emysql
Merge pull request #4 from slepher/master

update
Separated removal of friendly triangles from main friend update loop
Friendly triangles now accelerate towards the player differently
some concepts for mmd style tables
[Security][ACL] Fixes identity retrieval with Doctrine proxies

Closes #3818, #2611, #2056, #2048, #2035
Send version string to Vim.
Version 0.2-DEV

+ LocationStore null checks
+ Static Random
+ PotionUpdater
+ Potion and Item getter via class
+ PlayerMessager
+ Kill and Death skeleton
+ Smite static access fix
+ gitignore
Git ignore issue
Big refactoring
add new class 'KHashMt'.
switched order of -POS/-RCP tags wrt case tags
switched order of -POS/-RCP tags wrt case tags
added 13th file from Hdt. Bk. 1
Creted test helper: around_all_in_empty_dir()
init:project now stores the resource version in .corvid/version.yml
Map class update
1. updated registration_form_data.py 2. added new test files - login_form_data.py, forgetpassword_form_data.py
.gitignoren pelastusyritys
nyt saattaa räjähtää
remove leaderboard
Merge branch 'master' of github.com:jasonLaster/DGD

Conflicts:
	VERSION
Merge branch 'master' into 48-error-pages
oData Metadata generator require jaydata-genx
NOVA: make noux_tool_chain happy

Multiple calls to get the dataspace capability on NOVA lead to the situation
that the caller gets each time a new mapping of the same capability at
different indexes.

The client/caller assumes to get every time the very same index, e.g. in
Noux the index is used to look up structures.

Cache the dataspace capability returned via a rm_session for base-nova.
libports: add pcre-8.3 (8bit only)

For it is enough to just provide the 8bit version of pcre.
libports: add poll() to libc

Implements poll() via select() for certain programs like OpenSSH
which need it.

(This implementation is actually based OpenSSHp's compat function.)
Noux: add noux-pkg/lighttpd
Let git ignore libports/include/ncurses/ncurses.h
libc: Add munmap support to plugin interface

With this patch, libc plugins become able to handle munmap for regions
attached by the plugin.
tar_rom: Ignore leading './' in tar archives
Add mmap and nunmap to libc_noux, libc_fs

In the current form, only PROT_READ is supported. This case is emulated
by copying the file content into new allocated backing store. Even
though the performance benefits of mmap-using code will not be
preserved, code that relies on mmap can be executed via the libc_noux
or libc_fs plugins, i.e. lightttpd.
Native version of lighttpd

The port of lighttpd at 'ports/src/app/lighttpd' executes the web server
directly (w/o using Noux). It is accompanied by the lighttpd.run script.

At the current stage, lighttpd is starting up but fails because of an
unsupport fcntl call.
Noux: add noux_net_lighttpd.run

This patch adds lighttpd as noux package. However, we do not use the
original build system but rather compile lighttpd directly from the
Genode build system. This is needed because we want to statically link
lighttpd modules into the binary. This mode is (somehow) supported by
the SConscript that comes with lighttpd. However, the GNU build scripts
do not expose this feature.
Noux: change default --prefix in noux.mk

The directory specified by --prefix is not only used to determine
the install location but is also used by -rpath. Therefor it is
better to use $(DESTDIR) to install the binaries to the right
directory and to use --prefix to express the actual location within
NOUX.
libports: enable SO_REUSEADDR in lwip
install update
another install update
Merge branch 'seconBranch'
Changed from System.currentTimeMillis() to SystemClock.uptimeMillis() as requested by issue-236
change to iDash.sln
Create a glance-rsyslog cookbook, called by both registry and API, to setup syslog facilities and log locations
Update minitest integration

Since the integration is dependent on minitest-rails, use its test class.
Did MiniTest::Spec::Decorator ever exist in this project?
Merge pull request #283 from blowmage/minitest-rails

Update minitest integration
Issue 922: Add missing javadoc to CloudWatch.listMetrics(MetricClient, ListMetricsOption).

* Follow-up to b820b326b4502eb55bc55b27e1723f13106c3910
Merge pull request #623 from jcscoobyrs/master

Issue 922: Add missing javadoc to CloudWatch.listMetrics(MetricClient, ListMetricsOption).
WindowsClientLiveTest wasn't running due to lack of BouncyCastleCryptoModule and a problem with the test properties
EC2 Windows AMIs have a separate owner (which changed recently) - add this owner ID to the default set. Update WindowsClientLiveTest to use the default set and verify it passes.
Move WindowsClientLiveTest from ec2 to aws-ec2 as it depends on AWS's published AMIs and naming conventions
Merge pull request #583 from richardcloudsoft/ec2-windows

AWS EC2: add owner ID of the Amazon Windows images to the default set
much faster vips_argument_map()

improve the way we handle looping over args, gets us back to 7.26 speed
for example workspaces
Merge remote-tracking branch 'origin/7.28'

Conflicts:
	libvips/iofuncs/object.c
Merge pull request #44 from jdalphon/redactor_image_upload

Redactor image upload
Merge pull request #45 from jdalphon/redactor_image_upload

Added collapsible panels for fields,media,sessions
Added sort and pagination to some stuff
Slighly more specific privacy policy.
Corrected radius formula
Fixed syntax error from commenting out auto resize method
the proxy server now listens on any interface by default
bugfix: typo
added a connection error dialog
translating node to brackets error codes
Remove TAO reference because it is in petscapp.bib, add vortex breakup refs
Added ability to continuously save songs while they are playing
Deleted Last Paragraph
Fix default location of wsdl and topo
Catch configuration error and present to user.

createApplication is now completely wrapped in a try/catch block to catch the ConfigurationError in a more friendly way. The user will only see the error message, not the unhelpful/unfriendly stacktrace.
Dump the xsl directory.  (All this stuff is now in a different repo.)
add crm114-mode and haskell-mode
correct menu and aside boxes
WIP
Merge branch 'master' of github.com:jhughes1010/tms
0.4.1 I18n refresh
I18n refesh and MessagesPanel improvements
testing responsive changes
added code styling, fixed article
v0.07: Sort & Empty List

v0.07: Sort Alphabetically/by Status (non-persistent), Empty List.
Cleaned up a few small mistakes and did light documentation.
adding message on tmux source file
simplify WaitLogger#on_msg
simplify msgs sorting
net: make TestDialTimeoutFDLeak a bit robust

TestDialTimeoutFDLeak will fail when system state somaxconn is
greater than expected fixed value.

Fixes issue 4384 (again).

R=fullung, dave, rsc
CC=golang-dev
https://codereview.appspot.com/6873069
Release of version 0.1.2.
Merge branch 'release-0.1.2' into develop
trying to fix the delete function
fixed deleting problem
asdf
fixed database delete error
Merge branch 'fix'
Separação de tipos por arquivos, reconhecimento de palavras e estrutura dos analisadores
Analisador ID, removida Saida.txt
Fixing styles for tiles; adding links in footer
Merge branch 'master' of github.com:johnheimkes/owc
Bracketed command line info for now.
Renamed "default" prop to "flag_value" and "if_absent" to "default". Previous behaviour turned out to be highly non-intuitive and error-prone.
Clean Up

* Cleans up some 404 errors
* Adds files for old jQuery fix
Family Additions

* Adds footer
* Adds updated jquery
More Family Friends

Howdy new friends!
Header fix

Light weight
Posts are things that can be added to blogs.
Adding support for deploying EBS back instance with new IOPS settings
Revert "Adding support for deploying EBS back instance with new IOPS settings"

This reverts commit 54fbacc7e75b307b59b6277a0733d2cb0fcf52c8.
Adding support to enable EBS Optimized AWS instances
Fix error on summary when server is complete
add ephemeral option
Merge remote-tracking branch 'zsid/master'
Merge pull request #1 from scottbessler/master

allow ephemeral on EBS, and provisioned_iops
обновлено граффическое исполнение кнопок
Jeyakar - New Layout implementation - Roles pages
Restrict materials popup to appear within our page.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
IKNINJA-1924 - Hovering over panel resizers after collapsing and expanding panel causes error.

Canvas sizes were not updated when using the splitter to toggle collapse/expansion of panels. This was fixed by the StageDrawingFixes pull request. We should also guard agains null value in stage's getElement routine.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
IKNINJA-1899 - Fixed runtime error when undoing a delete shape action.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
IKNINJA-1780 - [Shape] Error when opening document that contains a shape with gradient color or no color.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
If no material was defined, use Flat material when switching from 2d to WebGL shape.

Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Binding view: fixed mouse move event outside the hud

- Changing the variable event to 'e'

Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Merge branch 'Fixes_071' of https://github.com/mqg734/ninja
Merge branch 'refs/heads/Ninja-Master' into FileIO
Trying out an indexeddb shim for safari
Trying out an indexeddb shim for safari
Import net-mgmt/glpi-plugins-tracker-agent version 1.5.3_1
Import x11-themes/gtk-murrina-fancy-clearlooks version 0.5_5
Import x11-themes/gnome-icons-aqua-fusion version 20030216_3
Import x11-themes/gnome-icons version 20060914_3
Import net-mgmt/nagios-check_hp_bladechassis version 1.0.1
Import x11-themes/metacity-digital-cream-theme version 1.0_7
Import net-mgmt/nagios-snmp-plugins-extras version 1.1.2_1
Import archivers/p5-Archive-Extract-Libarchive version 0.38
Import devel/p5-Algorithm-FloodControl version 2.001000
Import devel/p5-Algorithm-Numerical-Shuffle version 1.4
Import misc/p5-Business-ISBN-Data version 20120719.001
Import www/p5-CGI-Application-Plugin-DBH version 4.00
Import www/p5-CGI-Session-ExpireSessions version 1.12
Import databases/p5-Dancer-Session-Memcached version 0.2.02
Import graphics/p5-Captcha-reCAPTCHA-Mailhide version 0.94
Import misc/p5-Business-ISBN version 2.05
Import devel/p5-DateTime-Calendar-Mayan version 0.06.01
Import textproc/p5-MARC-Lint version 1.44
Import www/p5-WebService-ISBNDB version 0.34
Import devel/p5-Glib-Object-Introspection version 0.010
added theme_base and theme_wsj
added paginator, nicer layout
fixing ajax requesting
job posting field fixes
deploy.rb update
mongo uses database based on node env (jsla_jobs-development, jsla_jobs-test, etc)
added mocha dev dependency
added chai dev dependency
app is requireable for tests
created test helper and basic tests
added test for /my/jobs protection
fixing bugs in map op 3 to 3
self.installed_products != self.installedProducts
Fixed a small bug in the code that caused the meeting date to be incorrect.
possible fix for affix :p
publishig to ls
Removed non-community-building-friendly stuff
Merge from 2.10 branch.
Updated for 2.10's correct handling of shadowing and implicits.
Merge pull request #90 from jsuereth/1.12-scala-2.10

Updated for 2.10's correct handling of shadowing and implicits.
Merge remote-tracking branch 'origin/1.12-scala-2.10' into community
Fix to community build for 2.10.x
fix indentation when there is an unbalanced parentheses in the previous line
fix indentation of multi comments (issues #1)
Merge branch 'hotfix/0.1.4'
fixing bug in sidebar where opacity was 0 for existing nodes
New Stuff for 2012
2012
use mixer::get_mixables instead of server_base::get_mixables and remove the latter interface
move and combine ifdefs
move server_argv instance from each server to server_base
fix format
fix format
fix format
make jubaconv command when HAVE_ZOOKEEPER_H is disabled
removing dupe variable
adding initial plug for helpers in mustache and stubs w/ reqs for each
fixing up the live demo
Merge branch 'master' of github.com:jupiterjs/canjs
Added optional YUI modules to the build process
start of new canui accordion widget
Close GH-246: Fix ie.js IE8 compatibility. Fixes #244
fixed broken HTML structure
Merge pull request #247 from juristr/fix-backbone-html

fixed broken HTML structure
Backbone app: Cleanup, code style, etc
Backbone app: Fix app trying to update cleared model
Use the Underscore escape interpolation in user supplied strings in the Backbone apps. Fixes #250
Backbone+require app: Convert to tabs
Backbone+Require app improvements

- Cleanup
- Code style
- Fix bug with removing todo after editing and the todo is empty
- Update dependencies
Ember+Require app: Apply the fix from Ember app for showing selected filter in the filter bar. Fixes #220
Template: Fix double-clicking on the checkbox triggering editing mode. Fixes #227
Close GH-251: Montage.
**First, thanks to do this awesome job with TodoMVC, It's great to see some projects like this :)**

Here my modifications to respect the "best-pratices" in Backbone.js :

**Model** - js/models/todo.js

 - remove `initialize` method in Model (useless because `defaults` do already the job)
 - remove `clear` method, we should not change `clear` behavior of Backbone.Model -> http://backbonejs.org/#Model-clear

**Views** - js/views/app.js and js/views/todos.js

 - Call model.destroy() (model.clear(); is not logic)
 - Use this.$el instead of $(this.el) to improve readability and caching

Correct this issue: https://github.com/addyosmani/todomvc/issues/223 with adding `window.app.Todos.on( 'change:completed', this.addAll, this );` and `add` event call now `addAll` method in *js/views/app.js*

Issue related too: https://github.com/addyosmani/todomvc/issues/253
Add point in comments.
Use this.$el, model.destroy() and change application behavior on add and complete todo.
Merge pull request #256 from Atinux/master

Improvements in Backbone.js application
Backbone app: Improve namespacing
Convert from .select() to .focus()

#203
Remove all trailing whitespace and add EOF newlines
Remove Broke.js

It's now in the Wiki:
https://github.com/addyosmani/todomvc/wiki/Other-implementations
Backbone app: Add base.js
10/31 class and added features
Bug fix in FlipPenalty. Some variations in algorithm.
Some more comment to the employee scatter graph
Some refactoring of the create methods for documents and packages. Also fixed the database.yml file and fixed the before_filters on a couple controllers to simply authenticate the user and not worry about their roles for now.
add validation to Documents requiring at least 3 character Name and an uploaded file.
[core] Don't build the iOS 6 functionality with older SDKs.
More server game session framework
Merge remote-tracking branch 'jw/master'
Server returns move request
Merge remote-tracking branch 'jw/master'
Forgot packet ID in log output
progress on server unit movement + merge tom/master
Debug test
merge tom/master
Faction getId and move request response has faction id prepended
I MERGE WITH THE TOM
Attack move packet
merging with the tomster
i push it right up
adding facebook support, importing fb friends on registration, persisting
  split amount to database
Fixed formatting lightctl/README.md
Bind pulsr.local and static.pulsr.local domains to 127.0.0.1 before running Travis tests. Also start Pulsr.
remove old forms code from spider, as it is coupled to an specific UI
application and now forms can be exported as form requests instead. Also,
it is unused code.
Merge pull request #40 from kalessin/oldforms

remove old forms code from spider, as it is coupled to an specific UI
fixed spec examples, removed unneeded keys in root object
(items/project), and fixed indentation in examples so all indentations
are of length 4 (actually they are 2 and 4 length indentations mixed in
the doc)
Merge pull request #41 from kalessin/specsfix

fixed spec examples, removed unneeded keys in root object
tagged version 'v1.7.0.rc1'
added detect for Galaxy tab ( broken HTML5 )
adds use HLS test
add extension check fallback if mime is missing
Chapters: remove float left
fixed sp comment input textarea width to 200px.
Merge branch 'master' into pamyusoku
Added projects.html; also footer copy and related styles
Zmiany zwiazane z robieniem w JSONie, inne przesylanie adresow, wiecej niz jedna osoba w pokoju (defaultuje do 32).
Dodano funkcje sprawdzajaca czy wiadomosc jest uformowana wg. naszego protokolu.
Jak wiadomos przez to przejdzie to mozna wyciagac zawartosc korzystajac z funkcji opt ktore nie rzucaja wyjatkami.
Binarki w repo to sredni pomysl, ale cos mi nie wychodzi usuwanie.
Co ja robie
Changed offset for Data call.  Changed packet type.
sl/symdiscover: SE_ALLOW_SUBPATH_RANKING - a new option
New MeshLight interface
updated North York to Richmond Hill for the current presents
Contents of doc from commit 3b57eb1e
removed erroneous js include
- Updated cobertura-maven-plugin (2.5.1) => 2.5.2
Rename sql/maps to just maps

It’s not all SQL anyway.
Typo in comment
Indentation
Debug --raw-key option
Убрал из зависимотей JMS.
Support Dynamoid 0.5.0 with Real DynamoDB service.
Bugfix: fails when table is not exist.
Merge branch 'master' into bugfix_retry_of_PastehubSync
Add mew-6.5
Rename jdk's package name
Added initial client library
3.30, &c.
More notes on ch. 4
TODO: Higher-order operations
Use an element-type.
Simplify the data-model by removing element-accessors and `heap-=?'.
x -> element
Use element-datum.
Don't document internal function.
heap-key/datum -> heap-key
Remove `heapify!'.
Simplify make-max-heap and make-min-heap to take nothing or initial size.
Remove `build-heap!'.
extremum -> datum
Use element-accessors.
Update datum-docs.
Use element-accessors.
Use element-accessors.
Remove internal functions.
Add debug.
Add debug.
Modify tests to use public API.
0.3.1 -> 0.4
add tab bar controller to main window
add tab bar controller to main window.
改点缩进
Merge pull request #4 from kobe6672823/hm-dev

改点缩进
test Instagram JS SDK
Merge pull request #4 from kolektiv/master

Preliminary support for rename and renameAll
Documentation fix

・ドキュメントにLICENSESを追加。
・デフォルト値指定の記述方法誤り訂正
Removed redundent condition as a default template is always set
Tests for djano secret key generation
Do not test skeletor/__init__.py as we are testing individual componentns
Opt testing stub
Fix: missing module.exception path
Pep8 compliance
Test for custom option class
changed println to clojure logging
Change JoinPart test from an integration to a unit test
Fixed ctrlp_custom_ignore to ignore env.
make it possible to mark tasks as completed; bump to Rails 3.1.4
revised rest info layout and Type tag
rm wdired
update
Fixed the precompile bug
Added Oven Roasted Chicken recipe and linked it in readme
jomana read and committed for testing purproses
ef 5.0
Updated .gitignore.
Merge branch 'master' of github.com:laravel/laravel
Merge branch 'master' into develop
Fix auth bug and other resolver bugs.
Configuration option to set different server for asset files.
Fixes
whitespace fix
Merge pull request #578 from cviebrock/asset-url

Configuration option to set different base URL for assets
Allow the specification of a asset base URL.
Allow starter Closure for bundles.
Fix bug in array_pluck helper.
Can now check for existance of named views.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Fix bug where error is shown when named view isn't set.

Signed-off-by: Jason Lewis <jason.lewis1991@gmail.com>
Merge pull request #819 from jasonlewis/patch-11

Allow checking of named view existance.
fix eager loading of belongs_to relationships when all keys are null.
Remove Fluent\IO.

Signed-off-by: crynobone <crynobone@gmail.com>
MFC r234832:
Add support for missing gauth_number_of_chunks field. This Bug was
found by Irene Ruengeler.


git-svn-id: svn://svn.freebsd.org/base/stable/9@235123 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r234951:

Fix another RFC 6458 issue. Spotted by Irene Ruengeler.


git-svn-id: svn://svn.freebsd.org/base/stable/9@235124 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r234131:
	Return EBADF instead of EMFILE from dup2 when the second argument is
	outside the range of valid file descriptors

PR:		kern/164970
Approved by:	cperciva (implicit)


git-svn-id: svn://svn.freebsd.org/base/stable/9@235125 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r234104:

Apply changes from r233787 to ext2fs:

- Use more natural ip->i_flags instead of vap->va_flags in the final
  flags check.
- Style improvements.

No functional change intended.

MFC r234139:

Restore the blank line incorrectly removed in r234104.


git-svn-id: svn://svn.freebsd.org/base/stable/9@235131 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
MFC r235014:	Rebuild fix and LBA calculation fix for ThunderBolt
		based cards.

MFC r235016:	Some style improvements.

MFC r235040:	Fix the returns in mfi_tbolt_sync_map_info that I added.

PR:		167226


git-svn-id: svn://svn.freebsd.org/base/stable/9@235135 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Merge remote-tracking branch 'upstream/svn_stable_9' into svn_stable_9
Start 0.8-dev
vim: fix nerdcommenter bindings
add some git related tools,such as gitosis gerrit,etc.

Signed-off-by: zhangyongfang <lazy.zyf@gmail.com>
Updated with 2 examples
JRuby in README and .gitignore
more todo on the guides to make sure compete
added Arbeitsplatz
remove automatic byte compilation
change default font
Have part of query working. Having trouble returning string from callback...
Removed app id
Add documentation for Bks_Job
Documentation for the general sequence of actions, the controller takes
Use cmake as build system
fixed sha
Update setup design for pmahomme
Add StatsCache* config options for caching TABLE STATUS output in APC (if available)
Use sha1 instead of md5, reorder conditions for table status caching and avoid too many if's
Translated using Weblate.
Translated using Weblate.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Moved generation of print summary for queries to sql.php - allows better reuse of header_printview.inc.php
Use print.css in header_printview.inc.php
Moved parameters check out of the header file
Dropped theme-overridable print stylesheets
Merge pull request #62 from roccivic/fix-printview

Dropped theme-overridable printview stylesheets
Translated using Weblate.
Merge remote-tracking branch 'origin/master'
Translated using Weblate.
Merge remote-tracking branch 'origin/QA_3_5'
Consistent coding style
Single place to define CodeMirror CSS
Minimalize coding style changes between two bundled themes

This way we can really see how much they do differ.
Coding style improvements to advisor tests, add docs
Changes about /etc/profile.d/*

Changed the way the global profile scripts are sourced, to avoid some
trouble with bash specific code.

Further corrections are needed. Currently it is just a workaround.
Removed the titlebar changer in screenrc
Merge pull request #92 from lexoyo/develop

Develop
Merge pull request #93 from lexoyo/develop

improved touch and gestures
Merge pull request #94 from lexoyo/develop

added visibility show/hide in layers, to prevent the display of all laye...
Manage obsolete brix-ids
Merge pull request #95 from zabojad/develop

Manage obsolete brix-ids
Merge pull request #96 from lexoyo/develop

prevent default in links
fixed size and position calculation for absolute positioned elements
Bumping version number
Pointing to (hopefully) fixed git-tools
Pointing to latest
fixed?
fixing
latest
latest
stuff
Pad 2x2 and pyraminx scrambles
Merge github.com:cubing/tnoodle
Updating readme to reflect the fact that the memory issues are resolved, and new binary jar filename.
Updating TODO
Added tnoodle version number to pdfs and json.
Added tnoodle version number to pdfs and json. fixes #32
Merge branch 'master' of github.com:jfly/tnoodle
Forgot to include generationDate in JSON (pdfs already have it). fixes #32
Merged jfly's changes with scramble readme.
Update and add new tools.
terminal.py:  Terminal.newline() will no longer automatically apply a carriage return since this seems to break some legacy applications.
Removed Personal entries in the family ratings part of item screen
安装 OpenVPN 高亮插件

http://www.vim.org/scripts/script.php?script_id=1420
neocomplcache 启用更多种类的补全
.pxi 文件类型识别
minor change
httplog.vim update: add CONNECT method
update lusty-explorer
bbcode 高亮：打上 Fermat 的补丁

http://forum.ubuntu.org.cn/viewtopic.php?f=68&t=357658
rcode.vim update
添加 Join 命令
rcode 更新，添加 RcSelect 命令
Rcode.vim: Windows 上路径可能会使用反斜杠
Haskell 的设置
尽力修正 lex 中的高亮

不然，以下代码将会被错误地高亮：

%{
int count = 0;
%}
rcode.vim: minor improvement
neocomplcache: 覆盖 completefunc 设置

lua 插件会设置此选项，造成 neocomplcache 被禁用
一些命令添加 -bar 等参数
typo
Ctrl-g 可以显示文件路径

http://mid.gmane.org/4EFCA834.2070502@gmail.com
改变加密方法
日记路径更新
termination of POST string for CGI handler

For HTTP POST the body string was not correctly
terminated with a trailing '\0' character. This
commit fixes this appropriately.

Signed-off-by: Otto Linnemann <Otto.Linnemann@peiker.de>
removed autobuild artefacts

and added autogen script to generate these.

Signed-off-by: Otto Linnemann <linneman@gmx.de>
Use class: QNetworkDiskCache
Small changes
Fix pType elements: <subtitle> and <text-author>
Fix header blocks
Revert stray commit

git-svn-id: https://radegast.googlecode.com/svn/trunk@1239 f7a694da-4d33-11de-9ad6-1127a62b9fcd
Added two lines after name on Daily List.
Fixed bug in student_controller->daily_list
Merge pull request #11 from lonc/studentController

Fixed bug in student_controller->daily_list
- notes plugin
aprobb hibajavitasok

 1. NerdTree Bookmarks indulaskor kikapcsolva
 2. tab karakterek megjelenitesenek elegansabb modja (problema volt,
 hogy a megadasnal a sor vegen egy space-nek kellett lenni, mivel a vim
 ugy van beallitva, hogy a sor vegi felesleges space-eket leszedi, nem
 volt tul kenyelmes mindig visszaallitani)
updated z.sh + added various aliases
node 0.6.x --> 0.6.x and other fixes
pH meter Eagle schematics and PCB files (routed)
minor change in sitemap admin
Expanded lua api, light refactoring
Forgotten files
working on berserking
Run BDB disk-less for test_bitcoin
Store a fixed order of transactions (and accounting) in the wallet

For backward compatibility, new accounting data is stored after a \0 in the comment string.
This way, old versions and third-party software should load and store them, but all actual use (listtransactions, for example) ignores it.
Added animation for wheels, smoke

Also added config file with window parameters constants;
Added two files for wheels animate: rotation is 60 deg for each one
more duck typing
Version 1.4.8 PUBLISHED
Added documentation and updated README.md

Signed-off-by: lycis <daniel@deder.at>
Unknown changes caused by cxxtest generating tests.
adding support for swap (-s) option
added close. updated the interface.
added znodestat
work on fleur de lis
Django template source loader
変更対応
バグ修正
cursor: Fix up implementation for per-device barriers
cursor: Move pointer barrier code over to XI

For now, just move a bunch of code over, rename some things, and initialize
the new structures, but still consider it a separate codebase. Protocol
messages are still handled by XFixes, so there's no XI protocol addition,
yet.
Implement pointer barrier thresholds
Remove warning in php path management.
no functional changes.
Fix Show instance...ugh.
moar imgs
Fix: normalize => self.normalize
rnd stuff 2
[mr2036] Fix build in Visual Studio. Close #1050
[mr1970] fix very old bug in RAF, thx to Kirix
jsexercise4-redone
js4-done
safer checking to avoid crashes on bad interactivity data
Merge branch 'pub-interactivity'
Consolidate getWorkbenchState and getUserInfo into a single request:
getInitializationInfo. This is in preparation for asking server for
installation-specific site configuration info.
#3503 read json files from siteConfig folder
#3503
Pull code from correct branch.
#3503
Merge branch 'WidgetPaletteConfigurable' of https://billreed63@github.com/maqetta/maqetta.git into WidgetPaletteConfigurable
#3503 copy siteConfig folder to zip in build
#3503 move siteConfig folder out of scripts folder
#3503 and 3505 site config folder and theme sets
Merge branch 'master' into WidgetPaletteConfigurable

Conflicts:
	maqetta.core.client/WebContent/davinci/ui/widgets/NewHTMLFileOptions.js
	maqetta.core.server/src/maqetta/core/server/command/GetWorkbenchState.java
	maqetta.server.orion/maqetta-orion multi user.launch
	releng/davinci.releng/orion/maps/maqetta.map
#3503 a little more merge with master fallout
#3503 json for site
Merge branch 'master' into WidgetPaletteConfigurable

Conflicts:
	releng/davinci.releng/orion/widgetPlugin/widgetPluginDojoBuild.xml
	releng/davinci.releng/widgetPlugin/widgetPluginDojoBuild.xml
reparent documentation and sample code
Get "new review" properly onto the New dropdown menu
Add keyboard navigation testplan
Fix for #2669-- error when downloading workspace
Merge branch 'master' of github.com:maqetta/maqetta
Finish new test case for trees (#2678)
Merge branch 'master' of github.com:maqetta/maqetta into 79_set_properties_on_subitems_of_complex_widgets
update to use Deferreds. Module may be obsolete. #2126
Currently selected tab is now bold
Fix various bugs, and a few CSS tweaks. Fix bug where commentview was
getting added after the initial collapse/expand logic was invoked.
Upgrade to latest GridX commit
Merge branch 'master' of github.com:maqetta/maqetta into gridx_updates
Add initial fufill support
Enabling cobertura
renamed to work with psr-0
Added a newline to output
Działajacy plan zajec ;)
new set_buserr_action member to catch SIGBUS
added Mathml detection with polyfill via Mathjax
removed the submodule
updated the submodules and added gitdepend
Moving rewriting of Template literals and egal operators out of filters and into base hooks
add doc page about searching and filtering
make the s field invisible
add requirements.txt
docs update according to feedback mk
Merge remote-tracking branch 'sbaechler/master'

* sbaechler/master:
  docs update according to feedback mk
  add requirements.txt
  make the s field invisible
  add doc page about searching and filtering
lxml is a requirement too for towel.api
Mention NOTICE file in readme docs.
all autocomplete
-v
MANY THINGS
Finally fixed the screenshot URL.
Fixed: createConnectionEvent logged before taking actions connected with the event
Added - readme
Fixing an NPE involving custom blocks. More investigation needed to find the source of the issue.
Merge pull request #379 from Glitchfinder/master

Fixing an NPE
idioms
Merge branch 'master' of github.com:mcandre/mcandre
added Haskell memoization experiment
Fixed some bugs related to the contact subscription. And some changes to improve the use of domain name.
Merge branch 'chat_new_version' of github.com:mconf/mconf-web into chat_new_version
defvar
fixme
compiler return bytecode's size
quotation in macro
print_bytecode
strncpy fix
comment
license
fixes
tabs -> spaces, remove @-
danmakufu_bytecode.w
segfault fix in xcent
fix in xcent
danmakufu.w
fixes
dlist was extended
remove create_pool from dlist.c
fix dlist_once prototype
includes into danmakufu.c
ast.w
all db column is string type now, so update unit test accordingly
add more card detail
iAD added
enable code sign
update db i18n
copy storyboard of zh-Hans to en
add localized strings
update db for en
rename i18n string file
catch exception if dao return empty list
redeploy
resolve conflict
Added simple json handler
[Issue #7] shortened truncate method
Adding first cat
Adding dashboard another time
Removing to recover
fix store
fix product
switchet to new asset server!
updated capistrano recipes
Site: announce version 1.0.4
asd
n
Change include.
switched to app.js
ei lähteny pollit käyntiin
English file retrieved

English file retrieved
vm1 promoted to vm.scm. all instructions except CC implemented; vm further simplified and streamlined. linking implemented.
Adding the running specs methods
Adding some basic Rspec snippets
Revert "Adding the running specs methods"

This reverts commit 8e46031ff15d6462aa30b27630a570f74fc72266.
Merge pull request #12 from KensoDev/master

Adding basic Rspec snippets
Merge branch 'master' of git://github.com/astrails/dotvim
Fix issue #431

In prepare_ifs(), the ast was being walked recursively infinitely.
Merge pull request #432 from rvanvelzen/fix-431

Fix issue #431
fix a bug in JOIN
VERY rough block and unblock
Merge branch 'basset-devel2' into basset-devel